diff --git a/.gitignore b/.gitignore
index bd5ab21be51cb165bf682650852b4b9ef6ff76a7..c8ac704d51407c2dcf8f4b852d67ec70f19aa010 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ blob*
 *.swp
 *.swo
 *.elixxir*
+rid.txt
+nodeID-*.json
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ea278eb3df5e4bd8dbc03d05e16153af9f755dc..987bc36a5b0761836ea80ec49753e2f249920157 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,16 +17,16 @@ cache:
 variables:
   REPO_DIR: gitlab.com/elixxir
   REPO_NAME: server
-  DOCKER_IMAGE: sydney112/cuda-go:latest
+  DOCKER_IMAGE: elixxirlabs/cuda-go:latest
   # See https://docs.gitlab.com/ee/api/jobs.html#download-a-single-artifact-file-from-specific-tag-or-branch
   REPOS_API: https://gitlab.com/api/v4/projects/elixxir%2F
-  SERVER_URL: ${REPOS_API}server/jobs/artifacts/$SERVER_ID/raw/release/server.linux64?job=build
-  SERVER_GPU_URL: ${REPOS_API}server/jobs/artifacts/$SERVER_ID/raw/release/server-cuda.linux64?job=build
-  GPULIB_URL: ${REPOS_API}server/jobs/artifacts/$SERVER_ID/raw/gpumaths/cgbnBindings/powm/libpowmosm75.so?job=build
-  CLIENT_URL: ${REPOS_API}client/jobs/artifacts/$CLIENT_ID/raw/release/client.linux64?job=build
-  REGISTRATION_URL: ${REPOS_API}registration/jobs/artifacts/$REGISTRATION_ID/raw/release/registration.linux64?job=build
-  UDB_URL: ${REPOS_API}user-discovery-bot/jobs/artifacts/$UDB_ID/raw/release/udb.linux64?job=build
-  GATEWAY_URL: ${REPOS_API}gateway/jobs/artifacts/$GATEWAY_ID/raw/release/gateway.linux64?job=build
+  SERVER_URL: ""
+  SERVER_GPU_URL: ""
+  GPULIB_URL: ""
+  CLIENT_URL: ""
+  REGISTRATION_URL: ""
+  UDB_URL: ""
+  GATEWAY_URL: ""
   DEFAULTBRANCH: "release"
 
 before_script:
@@ -52,35 +52,15 @@ installbinaries:
   script:
     - git clean -ffdx
     - mkdir -p ~/.elixxir
-    - mkdir -p bin
-    - cd bin
-    - "DOWNLOADS=\"$SERVER_URL $CLIENT_URL $REGISTRATION_URL $UDB_URL $GATEWAY_URL $SERVER_GPU_URL $GPULIB_URL\""
-    - >
-      if [ "$CI_BUILD_REF_NAME" == "master" ]; then
-        DOWNLOADS=$(echo $DOWNLOADS | sed "s/artifacts\/$DEFAULTBRANCH\/raw/artifacts\/master\/raw/g")
-      fi
-    - >
-      for D in $DOWNLOADS; do
-        echo $D
-        curl -f -O -s -L -H "PRIVATE-TOKEN: $PATKEY" $D
-      done
-    - ls -lha
-    - mv server.linux64?job=build server
-    - mv server-cuda.linux64?job=build server-cuda
-    - mv client.linux64?job=build client
-    - mv udb.linux64?job=build udb
-    - mv registration.linux64?job=build permissioning
-    - mv gateway.linux64?job=build gateway
-    - mv libpowmosm75.so?job=build libpowmosm75.so
-    - mkdir -p /opt/elixxir/lib
-    - cp libpowmosm75.so /opt/elixxir/lib/
+    - ./download_cmix_binaries.sh
+    - mkdir -p /opt/xxnetwork/lib
+    - cp bin/libpowmosm75.so /opt/xxnetwork/lib/
     - "chmod +x *"
-    - cd ..
     - bin/server version
     - bin/server-cuda version
-    - bin/client --version || bin/client version
-    - bin/udb --version || bin/udb version
-    - bin/gateway --version || bin/gateway version
+    - bin/client version
+    - bin/udb version
+    - bin/gateway version
   artifacts:
     when: always
     expire_in: '1 day'
@@ -102,11 +82,11 @@ basice2e:
     - ls -lha
     - ./run.sh
     - mv results results-cpu
-    - mkdir -p /opt/elixxir/lib
-    - cp ../bin/libpowmosm75.so /opt/elixxir/lib/
+    - mkdir -p /opt/xxnetwork/lib
+    - cp ../bin/libpowmosm75.so /opt/xxnetwork/lib/
     - sed -i 's/bin\/server/bin\/server-cuda/g' run.sh
     - sed -i 's/useGpu\:\ false/useGpu\:\ true/g' server-[12345].yaml
-    - ./run.sh
+    - NSYSENABLED=TRUE ./run.sh
     - mv results results-gpu
     - cd ..
   artifacts:
diff --git a/basice2e/gateway-1.yaml b/basice2e/gateway-1.yaml
index 2e701eebd696dc6dc744db483414082dfb7d4969..33464f45660af83626fbfffa8a5196436246d3e6 100644
--- a/basice2e/gateway-1.yaml
+++ b/basice2e/gateway-1.yaml
@@ -6,42 +6,37 @@
 ################################################################################
 
 # Output log file
-log: "results/gateways/gatway-1.log"
+log: "results/gateways/gateway-1.log"
 
 # Log message level
 logLevel: 1
 
-# The cMix nodes in the network
-cMixNodes:
-  - "127.0.0.1:50000"
-  - "127.0.0.1:50001"
-  - "127.0.0.1:50002"
-  - "127.0.0.1:50003"
-  - "127.0.0.1:50004"
-  - "127.0.0.1:50005"
+# The public IP address and port of the node associated with this gateway
+nodeAddress: "127.0.0.1:50000"
 
 # The listening address of this gateway
-Port: 8440
+localAddress: "127.0.0.1"
+port: 8440
 
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
-MessageTimeout: 1800
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gateway-1-idf.json"
 
 # === REQUIRED FOR ENABLING TLS ===
 # Path to the private key file
 keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
 
-### Anything below this line is to be deprecated ###
+IP_Whitelist_File: "whitelist.txt"
+User_Whitelist_File: "whitelist.txt"
 
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
 
 # === END YAML
diff --git a/basice2e/gateway-2.yaml b/basice2e/gateway-2.yaml
index dfc2b3ddf0c135e12b721320f8b4106499464c18..2af19d873aa98bc22cae51b2bbbe4688b3fcf802 100644
--- a/basice2e/gateway-2.yaml
+++ b/basice2e/gateway-2.yaml
@@ -6,43 +6,37 @@
 ################################################################################
 
 # Output log file
-log: "results/gateways/gatway-2.log"
+log: "results/gateways/gateway-2.log"
 
 # Log message level
 logLevel: 1
 
-
-# The cMix nodes in the network
-cMixNodes:
-  - "127.0.0.1:50000"
-  - "127.0.0.1:50001"
-  - "127.0.0.1:50002"
-  - "127.0.0.1:50003"
-  - "127.0.0.1:50004"
-  - "127.0.0.1:50005"
+# The public IP address and port of the node associated with this gateway
+nodeAddress: "127.0.0.1:50001"
 
 # The listening address of this gateway
-Port: 8441
+localAddress: "127.0.0.1"
+port: 8441
 
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
-MessageTimeout: 1800
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gateway-2-idf.json"
 
 # === REQUIRED FOR ENABLING TLS ===
 # Path to the private key file
 keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
 
-### Anything below this line is to be deprecated ###
+IP_Whitelist_File: "whitelist.txt"
+User_Whitelist_File: "whitelist.txt"
 
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
 
 # === END YAML
diff --git a/basice2e/gateway-3.yaml b/basice2e/gateway-3.yaml
index 795fa10ad401d5280942d5994eb5d8d399c09370..4d2da33b4cca9f3812a54b385773577d8b95beee 100644
--- a/basice2e/gateway-3.yaml
+++ b/basice2e/gateway-3.yaml
@@ -6,43 +6,37 @@
 ################################################################################
 
 # Output log file
-log: "results/gateways/gatway-3.log"
+log: "results/gateways/gateway-3.log"
 
 # Log message level
 logLevel: 1
 
-
-# The cMix nodes in the network
-cMixNodes:
-  - "127.0.0.1:50000"
-  - "127.0.0.1:50001"
-  - "127.0.0.1:50002"
-  - "127.0.0.1:50003"
-  - "127.0.0.1:50004"
-  - "127.0.0.1:50005"
+# The public IP address and port of the node associated with this gateway
+nodeAddress: "127.0.0.1:50002"
 
 # The listening address of this gateway
-Port: 8442
+localAddress: "127.0.0.1"
+port: 8442
 
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
-MessageTimeout: 1800
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gateway-3-idf.json"
 
 # === REQUIRED FOR ENABLING TLS ===
 # Path to the private key file
 keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
 
-### Anything below this line is to be deprecated ###
+IP_Whitelist_File: "whitelist.txt"
+User_Whitelist_File: "whitelist.txt"
 
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
 
 # === END YAML
diff --git a/basice2e/gateway-4.yaml b/basice2e/gateway-4.yaml
index e8c03372224dc62dfc7cff35ec3f94d78229bfea..76a93bc2cee839676f17120c06425d56b9379968 100644
--- a/basice2e/gateway-4.yaml
+++ b/basice2e/gateway-4.yaml
@@ -6,42 +6,36 @@
 ################################################################################
 
 # Output log file
-log: "results/gateways/gatway-4.log"
+log: "results/gateways/gateway-4.log"
 
 # Log message level
 logLevel: 1
 
-# The cMix nodes in the network
-cMixNodes:
-  - "127.0.0.1:50000"
-  - "127.0.0.1:50001"
-  - "127.0.0.1:50002"
-  - "127.0.0.1:50003"
-  - "127.0.0.1:50004"
-  - "127.0.0.1:50005"
+# The public IP address and port of the node associated with this gateway
+nodeAddress: "127.0.0.1:50003"
 
 # The listening address of this gateway
-Port: 8443
+localAddress: "127.0.0.1"
+port: 8443
 
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
-MessageTimeout: 1800
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gateway-4-idf.json"
 
 # === REQUIRED FOR ENABLING TLS ===
 # Path to the private key file
 keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
-
-### Anything below this line is to be deprecated ###
 
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
+IP_Whitelist_File: "whitelist.txt"
+User_Whitelist_File: "whitelist.txt"
 
 # === END YAML
diff --git a/basice2e/gateway-5.yaml b/basice2e/gateway-5.yaml
index f0aa1bbd0d869da1f7704a16d2823d9f7131ec97..7a309523649345e9e2d04477daafab0abccf43da 100644
--- a/basice2e/gateway-5.yaml
+++ b/basice2e/gateway-5.yaml
@@ -6,42 +6,36 @@
 ################################################################################
 
 # Output log file
-log: "results/gateways/gatway-5.log"
+log: "results/gateways/gateway-5.log"
 
 # Log message level
 logLevel: 1
 
-# The cMix nodes in the network
-cMixNodes:
-  - "127.0.0.1:50000"
-  - "127.0.0.1:50001"
-  - "127.0.0.1:50002"
-  - "127.0.0.1:50003"
-  - "127.0.0.1:50004"
-  - "127.0.0.1:50005"
+# The public IP address and port of the node associated with this gateway
+nodeAddress: "127.0.0.1:50004"
 
 # The listening address of this gateway
-Port: 8444
+localAddress: "127.0.0.1"
+port: 8444
 
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
-MessageTimeout: 1800
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gateway-5-idf.json"
 
 # === REQUIRED FOR ENABLING TLS ===
 # Path to the private key file
 keyPath: "../keys/cmix.rip.key"
 # Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
 # Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
-
-### Anything below this line is to be deprecated ###
 
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
+IP_Whitelist_File: "whitelist.txt"
+User_Whitelist_File: "whitelist.txt"
 
 # === END YAML
diff --git a/basice2e/permissioning.yaml b/basice2e/permissioning.yaml
index bf53312b78061e36529a9d26c01874cc1d863075..ee320426c223638b385bc6865e02710c382cc4ec 100644
--- a/basice2e/permissioning.yaml
+++ b/basice2e/permissioning.yaml
@@ -3,11 +3,13 @@
 # ==================================
 
 # Log message level
-logLevel: 1
+logLevel: 2
 
 # Path to log file
 logPath: "results/permissioning.log"
 
+ndfOutputPath: "results/ndf.json"
+
 # The listening port of this server
 port: 18000
 
@@ -15,22 +17,24 @@ port: 18000
 dbUsername: ""
 dbPassword: ""
 dbName: ""
-dbAddress: ""
+dbAddress: "0.0.0.0:6969"
 
 minimumNodes: 5
 
-# List of Node registration codes (in order of network placement)
-registrationCodes:
-  - "AAAA"
-  - "BBBB"
-  - "CCCC"
-  - "DDDD"
-  - "EEEE"
+minGatewayVersion: "1.1.0"
+minServerVersion:  "1.0.0"
+nodeMetricInterval: 3
 
 clientRegCodes:
   - "FFFF"
   - "GGGG"
 
+# Path to the file containing the round ID
+roundIdPath: "results/roundId.txt"
+
+# Path to the file containing the update ID
+updateIdPath: "results/updateId.txt"
+
 # === REQUIRED FOR ENABLING TLS ===
 # Path to the registration server private key file
 keyPath: "../keys/cmix.rip.key"
@@ -49,6 +53,9 @@ serverCertPath: "../keys/cmix.rip.crt"
 
 udbID: 3
 
+# Time interval (in minutes) in which the database is
+# checked for banned nodes
+BanTrackerInterval: "3"
 
 groups:
   cmix:
diff --git a/basice2e/regCodes.json b/basice2e/regCodes.json
index e491b421986134e50cae3449f25442508dacf9eb..f0f63410b57c9ae070c9377175a98d40d89180fb 100644
--- a/basice2e/regCodes.json
+++ b/basice2e/regCodes.json
@@ -1 +1 @@
-[{"RegCode": "qpol", "Order": "0"},{"RegCode": "yiiq", "Order": "1"},{"RegCode": "vydz", "Order": "2"},{"RegCode": "gwxs", "Order": "3"},{"RegCode": "nahv", "Order": "4"}]
+[{"RegCode": "qpol", "Order": "0"},{"RegCode": "yiiq", "Order": "1"},{"RegCode": "vydz", "Order": "2"},{"RegCode": "gwxs", "Order": "3"},{"RegCode": "nahv", "Order": "4"}, {"RegCode": "doko", "Order": "5"}]
diff --git a/basice2e/registration.json b/basice2e/registration.json
index 22c395c168e8c4be9868d1c55f4bd0165fae9ef0..e385b2c0265528c244b236b6fd32ee2d8f0eb99a 100644
--- a/basice2e/registration.json
+++ b/basice2e/registration.json
@@ -1,6 +1,12 @@
 {
-    "TeamSize": 5,
-    "BatchSize": 4,
-    "RandomOrdering": false,
-    "MinimumDelay": 300
+  "TeamSize": 5,
+  "BatchSize": 32,
+  "RandomOrdering": false,
+  "MinimumDelay": 60,
+  "RealtimeDelay": 120,
+  "Threshold":     3,
+  "NodeCleanUpInterval": 3,
+  "ResourceQueueTimeout": 300000,
+  "Secure": 		     false
+
  }
diff --git a/basice2e/run.sh b/basice2e/run.sh
index c7157effe08bc386f39469f4894436aaf9c69b30..4fa4a557dbd5682ce0ecf3c286579ec9079beaf6 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -6,6 +6,8 @@ set -e
 
 rm -fr results || true
 rm blob* || true
+rm server-5.qdstrm || true
+rm server-5.qdrep || true
 
 mkdir -p .elixxir
 
@@ -26,14 +28,6 @@ mkdir -p $GATEWAYLOGS
 mkdir -p $CLIENTOUT
 mkdir -p $CLIENTCLEAN
 
-# Start a user discovery bot server
-echo "STARTING UDB..."
-UDBCMD="../bin/udb --logLevel 3 --config udb.yaml -l 1"
-$UDBCMD >> $UDBOUT 2>&1 &
-PIDVAL=$!
-echo $PIDVAL >> results/serverpids
-echo "$UDBCMD -- $PIDVAL"
-
 echo "STARTING SERVERS..."
 
 PERMCMD="../bin/permissioning -c permissioning.yaml "
@@ -44,7 +38,11 @@ echo "$PERMCMD -- $PIDVAL"
 for SERVERID in $(seq 5 -1 1)
 do
     IDX=$(($SERVERID - 1))
-    SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
+    SERVERCMD="../bin/server --config server-$SERVERID.yaml"
+    if [ $SERVERID -eq 5 ] && [ -n "$NSYSENABLED" ]
+    then
+        SERVERCMD="nsys profile --session-new=gputest --trace=cuda -o server-$SERVERID $SERVERCMD"
+    fi
     $SERVERCMD > $SERVERLOGS/server-$SERVERID-console.txt 2>&1 &
     PIDVAL=$!
     echo "$SERVERCMD -- $PIDVAL"
@@ -54,7 +52,7 @@ done
 for GWID in $(seq 5 -1 1)
 do
     IDX=$(($GWID - 1))
-    GATEWAYCMD="../bin/gateway  -i $IDX  --config gateway-$GWID.yaml"
+    GATEWAYCMD="../bin/gateway --config gateway-$GWID.yaml"
     $GATEWAYCMD > $GATEWAYLOGS/gateway-$GWID-console.txt 2>&1 &
     PIDVAL=$!
     echo "$GATEWAYCMD -- $PIDVAL"
@@ -64,6 +62,10 @@ jobs -p > results/serverpids
 
 finish() {
     echo "STOPPING SERVERS AND GATEWAYS..."
+    if [ -n "$NSYSENABLED" ]
+    then
+        nsys stop --session=gputest
+    fi
     # NOTE: jobs -p doesn't work in a signal handler
     for job in $(cat results/serverpids)
     do
@@ -86,11 +88,29 @@ cnt=0
 echo -n "Waiting for a round to run"
 while [ ! -s rid.txt ] && [ $cnt -lt 120 ]; do
     sleep 1
-    cat results/servers/server-5.log | grep "RID 0 ReceiveFinishRealtime END" > rid.txt || true
+    grep -a "RID 1 ReceiveFinishRealtime END" results/servers/server-5.log > rid.txt || true
     cnt=$(($cnt + 1))
     echo -n "."
 done
 
+# Start a user discovery bot server
+echo "STARTING UDB..."
+UDBCMD="../bin/udb --logLevel 3 --config udb.yaml -l 1"
+$UDBCMD >> $UDBOUT 2>&1 &
+PIDVAL=$!
+echo $PIDVAL >> results/serverpids
+echo "$UDBCMD -- $PIDVAL"
+
+rm rid.txt || true
+while [ ! -s rid.txt ] && [ $cnt -lt 30 ]; do
+    sleep 1
+    grep -a "Gateway Polling for Message Reception Begun" results/udb-console.txt > rid.txt || true
+    cnt=$(($cnt + 1))
+    echo -n "."
+done
+
+sleep 5
+
 runclients() {
     echo "Starting clients..."
 
@@ -108,7 +128,7 @@ runclients() {
             nid=$(((($cid + 1) % 4) + 4))
             eval NICK=\${NICK${cid}}
             # Send a regular message
-            CLIENTCMD="timeout 60s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client$cid$nid.log -f blob$cid -E email$cid@email.com -i $cid -d $nid -m \"Hello, $nid\""
+            CLIENTCMD="timeout 120s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client$cid$nid.log -f blob$cid -E email$cid@email.com -i $cid -d $nid -m \"Hello, $nid\""
             eval $CLIENTCMD >> $CLIENTOUT/client$cid$nid.txt 2>&1 &
             PIDVAL=$!
             eval CLIENTS${CTR}=$PIDVAL
@@ -164,11 +184,11 @@ wait $PIDVAL || true
 
 # Register non-precanned users
 echo "REGISTERING NEW USERS..."
-CLIENTCMD="timeout 180s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client42.log -f blob42 -E rick42@elixxir.io -r FFFF"
+CLIENTCMD="timeout 210s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client42.log -f blob42 -E rick42@elixxir.io -r FFFF"
 eval $CLIENTCMD >> $CLIENTOUT/client42.txt &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 180s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client43.log -f blob43 -E ben43@elixxir.io -r GGGG"
+CLIENTCMD="timeout 210s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client43.log -f blob43 -E ben43@elixxir.io -r GGGG"
 eval $CLIENTCMD >> $CLIENTOUT/client43.txt &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -197,11 +217,11 @@ BENID=${TMPID%?} # remove ! from end
 
 # Non-precanned user messaging
 echo "SENDING E2E MESSAGES TO NEW USERS..."
-CLIENTCMD="timeout 180s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -c 1 -w 1 --dest64 $BENID -s \"ben43@elixxir.io\" -f blob42 -m \"Hello from Rick42, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -c 1 -w 1 --dest64 $BENID -s \"ben43@elixxir.io\" -f blob42 -m \"Hello from Rick42, with E2E Encryption\" --end2end"
 eval $CLIENTCMD >> $CLIENTOUT/client42.txt || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 180s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -c 1 -w 1 --dest64 $RICKID -s \"rick42@elixxir.io\" -f blob43 -m \"Hello from Ben43, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 210s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -c 1 -w 1 --dest64 $RICKID -s \"rick42@elixxir.io\" -f blob43 -m \"Hello from Ben43, with E2E Encryption\" --end2end"
 eval $CLIENTCMD >> $CLIENTOUT/client43.txt || true &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index be35827812cea615acabc155660bc4d9561f6222..07407e32020e83efd6e35c30583870ad751b51d1 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -4,56 +4,32 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-skipReg: true
-# Log message level
-logLevel: 1
-
-useGpu: false
-
+# registration code used for first time registration. Unique. Provided by xx network
+registrationCode: "qpol"
+useGPU: false
 node:
-    id: ""
     paths:
+        idf:  "results/servers/nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-1.log"
-    addresses:
-        - "127.0.0.1:50000"
-        - "127.0.0.1:50001"
-        - "127.0.0.1:50002"
-        - "127.0.0.1:50003"
-        - "127.0.0.1:50004"
+        errOutput: "results/servers/server-1.err"
+    port: 50000
+    listeningAddress: "127.0.0.1"
 database:
     name: "node1"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
-  registrationCode: "qpol"
-  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
-  e2e:
-    prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
-    smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
-    generator: "2"
+metrics:
+  # location of stored metrics data. Modification to set to permissioning
+  # server instead of saving will be made at a later date
+  log:  "results/servers/server-1-metrics.log"
 # === END YAML
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 563df4fa4fe625eb2103de276298c75ae59ab509..83ee21b10cd760797061b5608a79f691a55b4bbd 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -4,57 +4,32 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-skipReg: true
-# Log message level
-logLevel: 1
-
-useGpu: false
-
+# registration code used for first time registration. Unique. Provided by xx network
+registrationCode: "yiiq"
+useGPU: false
 node:
-    id: ""
     paths:
+        idf:  "results/servers/nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-2.log"
-    addresses:
-      - "127.0.0.1:50000"
-      - "127.0.0.1:50001"
-      - "127.0.0.1:50002"
-      - "127.0.0.1:50003"
-      - "127.0.0.1:50004"
-      - "127.0.0.1:50005"
+        errOutput: "results/servers/server-2.err"
+    port: 50001
+    listeningAddress: "127.0.0.1"
 database:
     name: "node2"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
-  registrationCode: "yiiq"
-  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
-  e2e:
-    prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
-    smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
-    generator: "2"
+metrics:
+  # location of stored metrics data. Modification to set to permissioning
+  # server instead of saving will be made at a later date
+  log:  "results/servers/server-2-metrics.log"
 # === END YAML
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index d8d14b126297eb2c191ccb7b4bf61933e85e223f..1f8c2b30b38f3c0637cae5d234f9fdfc5995dfe2 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -4,57 +4,32 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-skipReg: true
-# Log message level
-logLevel: 1
-
-useGpu: false
-
+# registration code used for first time registration. Unique. Provided by xx network
+registrationCode: "vydz"
+useGPU: false
 node:
-    id: ""
     paths:
+        idf:  "results/servers/nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-3.log"
-    addresses:
-      - "127.0.0.1:50000"
-      - "127.0.0.1:50001"
-      - "127.0.0.1:50002"
-      - "127.0.0.1:50003"
-      - "127.0.0.1:50004"
-      - "127.0.0.1:50005"
+        errOutput: "results/servers/server-3.err"
+    port: 50002
+    listeningAddress: "127.0.0.1"
 database:
     name: "node3"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
-  registrationCode: "vydz"
-  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
-  e2e:
-    prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
-    smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
-    generator: "2"
+metrics:
+  # location of stored metrics data. Modification to set to permissioning
+  # server instead of saving will be made at a later date
+  log:  "results/servers/server-3-metrics.log"
 # === END YAML
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index 3d652c90eb6de6e48418ca1acf3567bf8e149086..9e280ddc85d07c088ff2888ba81d23a9432c9944 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -4,57 +4,32 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-skipReg: true
-# Log message level
-logLevel: 1
-
-useGpu: false
-
+# registration code used for first time registration. Unique. Provided by xx network
+registrationCode: "gwxs"
+useGPU: false
 node:
-    id: ""
     paths:
+        idf:  "results/servers/nodeID-4.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-4.log"
-    addresses:
-      - "127.0.0.1:50000"
-      - "127.0.0.1:50001"
-      - "127.0.0.1:50002"
-      - "127.0.0.1:50003"
-      - "127.0.0.1:50004"
-      - "127.0.0.1:50005"
+        errOutput: "results/servers/server-4.err"
+    port: 50003
+    listeningAddress: "127.0.0.1"
 database:
     name: "node4"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
-  registrationCode: "gwxs"
-  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
-  e2e:
-    prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
-    smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
-    generator: "2"
+metrics:
+  # location of stored metrics data. Modification to set to permissioning
+  # server instead of saving will be made at a later date
+  log:  "results/servers/server-4-metrics.log"
 # === END YAML
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 2498109fa57035f838330021c471a88803d373f9..f8a2a6eca79024e1e52be646ce62fd4154ca5f7f 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -4,57 +4,32 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-skipReg: true
-# Log message level
-logLevel: 1
-
-useGpu: false
-
+# registration code used for first time registration. Unique. Provided by xx network
+registrationCode: "nahv"
+useGPU: false
 node:
-    id: ""
     paths:
+        idf:  "results/servers/nodeID-5.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/servers/server-5.log"
-    addresses:
-      - "127.0.0.1:50000"
-      - "127.0.0.1:50001"
-      - "127.0.0.1:50002"
-      - "127.0.0.1:50003"
-      - "127.0.0.1:50004"
-      - "127.0.0.1:50005"
+        errOutput: "results/servers/server-5.err"
+    port: 50004
+    listeningAddress: "127.0.0.1"
 database:
     name: "node5"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "127.0.0.1:8440"
-        - "127.0.0.1:8441"
-        - "127.0.0.1:8442"
-        - "127.0.0.1:8443"
-        - "127.0.0.1:8444"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
   address: "127.0.0.1:18000"
-  registrationCode: "nahv"
-  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
-  e2e:
-    prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
-    smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
-    generator: "2"
+metrics:
+  # location of stored metrics data. Modification to set to permissioning
+  # server instead of saving will be made at a later date
+  log:  "results/servers/server-5-metrics.log"
 # === END YAML
diff --git a/download_cmix_binaries.sh b/download_cmix_binaries.sh
index b23783767d8a64107e74530587af76ac0975996d..4085efe0052ba1677158302d0a303bd543970f8e 100755
--- a/download_cmix_binaries.sh
+++ b/download_cmix_binaries.sh
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -x
-
 # Get platform parameter
 if [[ $1 == "l" ]] ||[[ $1 == "linux" ]] || [[ -z $1 ]]; then
     BIN=".linux64?job=build"
@@ -15,42 +13,94 @@ else
 fi
 
 # Set up the URL for downloading the binaries
-PRIVATEGRITY_REPOS="https://gitlab.com/api/v4/projects/elixxir%2F"
-MASTER_URL_FRAG="jobs/artifacts/release/raw/release"
-
-# Get URLs for artifacts from all relevant repos
-UDB_URL="${PRIVATEGRITY_REPOS}user-discovery-bot/$MASTER_URL_FRAG/udb$BIN"
-SERVER_URL="${PRIVATEGRITY_REPOS}server/$MASTER_URL_FRAG/server$BIN"
-GW_URL="${PRIVATEGRITY_REPOS}gateway/$MASTER_URL_FRAG/gateway$BIN"
-PERMISSIONING_URL="${PRIVATEGRITY_REPOS}registration/$MASTER_URL_FRAG/registration$BIN"
-CLIENT_URL="${PRIVATEGRITY_REPOS}client/$MASTER_URL_FRAG/client$BIN"
-
+DEFAULTBRANCH=${DEFAULTBRANCH:="release"}
+REPOS_API=${REPOS_API:="https://gitlab.com/api/v4/projects/elixxir%2F"}
 # Set up the gitlab access token
-PATKEY="rBxQ6BvKP-eFxxeM3Ugm"
+PATKEY=${PATKEY:="rBxQ6BvKP-eFxxeM3Ugm"}
 
 # Make the binaries directory
 download_path="$(pwd)/bin"
 mkdir -p "$download_path"
+# Delete old binaries
+rm $download_path/*
+
+# If we are on a feature branch, add it to the eval list
+FBRANCH=$(git rev-parse --abbrev-ref HEAD)
+if [[ "$CI_BUILD_REF_NAME" != "" ]]; then
+    FBRANCH=$CI_BUILD_REF_NAME
+fi
+FBRANCH=$(echo $FBRANCH | grep feature)
+# Also check for the branch name without the "feature" on it.
+FBRANCH2=$(echo $FBRANCH | sed 's/feature\///g')
+
+echo "Checking for binaries at $FBRANCH $FBRANCH2 $DEFAULTBRANCH..."
+echo "(Note: if you forced a branch, that is checked first!)"
+
+for BRANCH in $(echo "forcedbranch" $FBRANCH $FBRANCH2 $DEFAULTBRANCH); do
+    echo "Attempting downloads from: $BRANCH"
+    BRANCH_URL=${BRANCH_URL:="jobs/artifacts/$BRANCH/raw/release"}
+    # Get URLs for artifacts from all relevant repos
+    UDB_URL=${UDB_URL:="${REPOS_API}user-discovery-bot/$BRANCH_URL/udb$BIN"}
+    SERVER_URL=${SERVER_URL:="${REPOS_API}server/$BRANCH_URL/server$BIN"}
+    GW_URL=${GW_URL:="${REPOS_API}gateway/$BRANCH_URL/gateway$BIN"}
+    PERMISSIONING_URL=${PERMISSIONING_URL:="${REPOS_API}registration/$BRANCH_URL/registration$BIN"}
+    CLIENT_URL=${CLIENT_URL:="${REPOS_API}client/$BRANCH_URL/client$BIN"}
+    SERVER_GPU_URL=${SERVER_GPU_URL:="${REPOS_API}server/$BRANCH_URL/server-cuda.linux64?job=build"}
+    GPULIB_URL=${GPULIB_URL:="${REPOS_API}server/$BRANCH_URL/libpowmosm75.so?job=build"}
+
+    set -x
+
+    # Silently download the UDB binary to the provisioning directory
+    if [ ! -f $download_path/udb ] && [[ "$UDB_URL" != *"forcedbranch"* ]]; then
+        curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/udb" ${UDB_URL}
+    fi
+
+    # Silently download the Server binary to the provisioning directory
+    if [ ! -f $download_path/server ] && [[ "$SERVER_URL" != *"forcedbranch"* ]]; then
+        curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/server" ${SERVER_URL}
+    fi
+
+    # Silently download the Gateway binary to the provisioning directory
+    if [ ! -f $download_path/gateway ] && [[ "$GW_URL" != *"forcedbranch"* ]]; then
+        curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/gateway" ${GW_URL}
+    fi
+
+    # Silently download the permissioning binary to the provisioning directory
+    if [ ! -f $download_path/permissioning ] && [[ "$PERMISSIONING_URL" != *"forcedbranch"* ]]; then
+        curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/permissioning" ${PERMISSIONING_URL}
+    fi
 
-# Silently download the UDB binary to the provisioning directory
-curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/udb" ${UDB_URL}
+    # Silently download the permissioning binary to the provisioning directory
+    if [ ! -f $download_path/client ] && [[ "$CLIENT_URL" != *"forcedbranch"* ]]; then
+        curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/client" ${CLIENT_URL}
+    fi
 
-# Silently download the Server binary to the provisioning directory
-curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/server" ${SERVER_URL}
+    # Silently download the Server binary to the provisioning directory
+    if [ ! -f $download_path/server-cuda ] && [[ "$SERVER_GPU_URL" != *"forcedbranch"* ]]; then
+        curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/server-cuda" ${SERVER_GPU_URL}
+    fi
 
-# Silently download the Gateway binary to the provisioning directory
-curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/gateway" ${GW_URL}
+    # Silently download the GPU Library to the provisioning directory
+    if [ ! -f $download_path/libpowmosm75.so ] && [[ "$GPULIB_URL" != *"forcedbranch"* ]]; then
+        curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/libpowmosm75.so" ${GPULIB_URL}
+    fi
 
-# Silently download the permissioning binary to the provisioning directory
-curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/permissioning" ${PERMISSIONING_URL}
+    set +x
 
-# Silently download the permissioning binary to the provisioning directory
-curl -s -f -L -H "PRIVATE-TOKEN: $PATKEY" -o "$download_path/client" ${CLIENT_URL}
 
+    unset BRANCH_URL
+    unset UDB_URL
+    unset SERVER_URL
+    unset GW_URL
+    unset PERMISSIONING_URL
+    unset CLIENT_URL
+    unset SERVER_GPU_URL
+    unset GPULIB_URL
+done
 
 # Make binaries executable
-chmod +x "$download_path"/*
+chmod +x "$download_path"/[^l]*
 
 file "$download_path"/*
 
-echo "If you see HTML or anything but linux binaries above, something is messed up!"
+echo "If you see HTML or anything but linux/mac binaries above, something is messed up!"
diff --git a/smokeinfra/gateway-1.yaml b/smokeinfra/gateway-1.yaml
index 8eca765aa57cf0f99baf17a3de683d5dc75264a6..9190e9a783b43c3a124f5161a2ee9cee3424eb1b 100644
--- a/smokeinfra/gateway-1.yaml
+++ b/smokeinfra/gateway-1.yaml
@@ -6,41 +6,33 @@
 ################################################################################
 
 # Output log file
-log: "results/gateway-1.log"
+log: "results/gatway-1.log"
 
 # Log message level
 logLevel: 1
 
-# I am first node
-firstNode: "true"
-
-# The cMix nodes in the network
-cMixNodes:
- - "localhost:60000"
- - "localhost:60001"
- - "localhost:60002"
+# The public IP address and port of the node associated with this gateway
+nodeAddress: "127.0.0.1:60000"
 
 # The listening address of this gateway
-Port: 9440
+localAddress: "127.0.0.1"
+port: 9440
 
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
-MessageTimeout: 1800
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gateway-1-idf.json"
 
 # === REQUIRED FOR ENABLING TLS ===
-# Path to the gateway private key file
+# Path to the private key file
 keyPath: "../keys/cmix.rip.key"
-# Path to the gateway certificate file
+# Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
-# Path to the gateway certificate file
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
+# Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
-IP_Whitelist_File: whitelist.txt
-
-### Anything below this line is to be deprecated ###
 
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
 # === END YAML
diff --git a/smokeinfra/gateway-2.yaml b/smokeinfra/gateway-2.yaml
index fbff4a318d44d75b53a6da35841984c0a22c92e0..3af71c41a877ebf370c695780fc2fbdf5d81169e 100644
--- a/smokeinfra/gateway-2.yaml
+++ b/smokeinfra/gateway-2.yaml
@@ -6,37 +6,33 @@
 ################################################################################
 
 # Output log file
-log: "results/gateway-2.log"
+log: "results/gatway-2.log"
 
 # Log message level
 logLevel: 1
 
-# The cMix nodes in the network
-cMixNodes:
- - "localhost:60000"
- - "localhost:60001"
- - "localhost:60002"
+# The public IP address and port of the node associated with this gateway
+nodeAddress: "127.0.0.1:60001"
 
 # The listening address of this gateway
-Port: 9441
+localAddress: "127.0.0.1"
+port: 9441
 
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
-MessageTimeout: 1800
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gateway-2-idf.json"
 
 # === REQUIRED FOR ENABLING TLS ===
-# Path to the gateway private key file
+# Path to the private key file
 keyPath: "../keys/cmix.rip.key"
-# Path to the gateway certificate file
+# Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
-# Path to the gateway certificate file
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
+# Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 
-### Anything below this line is to be deprecated ###
-
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
 # === END YAML
diff --git a/smokeinfra/gateway-3.yaml b/smokeinfra/gateway-3.yaml
index b174be1c5ac0ff1f751d74e147626ab2557b97e6..4ab21b7499b9367a91c0fd6740b8f791193fdd15 100644
--- a/smokeinfra/gateway-3.yaml
+++ b/smokeinfra/gateway-3.yaml
@@ -6,41 +6,33 @@
 ################################################################################
 
 # Output log file
-log: "results/gateway-3.log"
+log: "results/gatway-3.log"
 
 # Log message level
 logLevel: 1
 
-# I am last node
-lastNode: "true"
-
-# The cMix nodes in the network
-cMixNodes:
- - "localhost:60000"
- - "localhost:60001"
- - "localhost:60002"
+# The public IP address and port of the node associated with this gateway
+nodeAddress: "127.0.0.1:60002"
 
 # The listening address of this gateway
-Port: 9442
+localAddress: "127.0.0.1"
+port: 9442
 
 # The number of seconds a message should remain in the globals before being
 # deleted from the user's message queue
-MessageTimeout: 1800
+messageTimeout: "1800s"
+
+# Path to where the IDF is saved. This is used by the wrapper management script.
+idfPath: "results/gateways/gateway-3-idf.json"
 
 # === REQUIRED FOR ENABLING TLS ===
-# Path to the gateway private key file
+# Path to the private key file
 keyPath: "../keys/cmix.rip.key"
-# Path to the gateway certificate file
+# Path to the certificate file
 certPath: "../keys/cmix.rip.crt"
-# Path to the gateway certificate file
+# Path to the permissioning certificate
+permissioningCertPath: "../keys/cmix.rip.crt"
+# Path to the certificate file
 serverCertPath: "../keys/cmix.rip.crt"
 
-### Anything below this line is to be deprecated ###
-
-# Batch size of the cMix Network (to be deprecated)
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
 # === END YAML
diff --git a/smokeinfra/permissioning.yaml b/smokeinfra/permissioning.yaml
index 7ebc9d6cb3e3b25dd6d03b1510486ec096c2c0af..1889e68751ba3db199310c82c9d6cc407345077c 100644
--- a/smokeinfra/permissioning.yaml
+++ b/smokeinfra/permissioning.yaml
@@ -8,6 +8,8 @@ logLevel: 1
 # Path to log file
 logPath: "results/permissioning.log"
 
+ndfOutputPath: "results/ndf.json"
+
 # The listening port of this server
 port: 18000
 
@@ -15,33 +17,24 @@ port: 18000
 dbUsername: ""
 dbPassword: ""
 dbName: ""
-dbAddress: ""
-
-# Selection of scheduling algorithem to use. Options are:
-#   simple - Schedules multiple teams to maximize performance, does not randomly re-arrange teams, if only a single
-#            only scheduling a single team, will use numerical ordering data for AlphaNet
-#   secure - Schedules new teams randomly, has apropreate buffers to ensure unpredictability, designed for BetaNet
-schedulingAlgorithm: "simple"
-
-# Path to file with config for scheduling algorithem within the user directory
-schedulingConfigPath: "registration.json"
-
-# Path to JSON file with list of Node registration codes (in order of network
-# placement)
-RegCodesFilePath: "regCodes.json"
+dbAddress: "0.0.0.0:6969"
 
 minimumNodes: 3
 
-# List of Node registration codes (in order of network placement)
-registrationCodes:
-  - "AAAA"
-  - "BBBB"
-  - "CCCC"
+minGatewayVersion: "1.1.0"
+minServerVersion:  "1.0.0"
+nodeMetricInterval: 3
 
 clientRegCodes:
   - "FFFF"
   - "GGGG"
 
+# Path to the file containing the round ID
+roundIdPath: "results/roundId.txt"
+
+# Path to the file containing the update ID
+updateIdPath: "results/updateId.txt"
+
 # === REQUIRED FOR ENABLING TLS ===
 # Path to the registration server private key file
 keyPath: "../keys/cmix.rip.key"
@@ -60,6 +53,9 @@ serverCertPath: "../keys/cmix.rip.crt"
 
 udbID: 3
 
+# Time interval (in minutes) in which the database is
+# checked for banned nodes
+BanTrackerInterval: "3"
 
 groups:
   cmix:
@@ -70,3 +66,16 @@ groups:
     prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
     smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
     generator: "2"
+
+# Selection of scheduling algorithem to use. Options are:
+#   simple - Schedules multiple teams to maximize performance, does not randomly re-arrange teams, if only a single
+#            only scheduling a single team, will use numerical ordering data for AlphaNet
+#   secure - Schedules new teams randomly, has apropreate buffers to ensure unpredictability, designed for BetaNet
+schedulingAlgorithm: "simple"
+
+# Path to file with config for scheduling algorithem within the user directory
+schedulingConfigPath: "registration.json"
+
+# Path to JSON file with list of Node registration codes (in order of network
+# placement)
+RegCodesFilePath: "regCodes.json"
diff --git a/smokeinfra/regCodes.json b/smokeinfra/regCodes.json
index 0e0625b2d93114e5d2a3bdf2c3b6ff7aab6aeee0..f0f63410b57c9ae070c9377175a98d40d89180fb 100644
--- a/smokeinfra/regCodes.json
+++ b/smokeinfra/regCodes.json
@@ -1 +1 @@
-[{"RegCode": "AAAA", "Order": "0"},{"RegCode": "BBBB", "Order": "1"},{"RegCode": "CCCC", "Order": "2"}]
+[{"RegCode": "qpol", "Order": "0"},{"RegCode": "yiiq", "Order": "1"},{"RegCode": "vydz", "Order": "2"},{"RegCode": "gwxs", "Order": "3"},{"RegCode": "nahv", "Order": "4"}, {"RegCode": "doko", "Order": "5"}]
diff --git a/smokeinfra/registration.json b/smokeinfra/registration.json
index ec20e9b162fca47f9ef4a07717d2118e3df88015..d4d1bf5a408b27ba5353f99390b7521d360cf711 100644
--- a/smokeinfra/registration.json
+++ b/smokeinfra/registration.json
@@ -1,6 +1,12 @@
 {
-    "TeamSize": 3,
-    "BatchSize": 42,
-    "RandomOrdering": false,
-    "MinimumDelay": 300
+  "TeamSize": 3,
+  "BatchSize": 32,
+  "RandomOrdering": false,
+  "MinimumDelay": 60,
+  "RealtimeDelay": 120,
+  "Threshold":     3,
+  "NodeCleanUpInterval": 3,
+  "ResourceQueueTimeout": 300000,
+  "Secure": 		     false
+
  }
diff --git a/smokeinfra/rid.txt b/smokeinfra/rid.txt
deleted file mode 100644
index 12d233f2777b2d175ba97b8962bf4db5698d0e6e..0000000000000000000000000000000000000000
--- a/smokeinfra/rid.txt
+++ /dev/null
@@ -1 +0,0 @@
-INFO 2020/05/11 18:26:39 [BJRMuGLveua8prM/udGT3rfn2pZk8rrdOs7gKgMbsLM=:60002]: RID 1 ReceiveFinishRealtime END
diff --git a/smokeinfra/run.sh b/smokeinfra/run.sh
index f900ce7f5ed82c3a5c90a7a5947ac5337a5611a0..85711d7a08b5edcd5c37dcb2eb33c0bdd7d79f9e 100755
--- a/smokeinfra/run.sh
+++ b/smokeinfra/run.sh
@@ -22,24 +22,22 @@ echo "STARTING SERVERS..."
 for SERVERID in $(seq 3 -1 1)
 do
     IDX=$(($SERVERID - 1))
-    SERVERCMD="../bin/server -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml"
+    SERVERCMD="../bin/server --config server-$SERVERID.yaml"
     $SERVERCMD > $SERVERLOGS/server-$SERVERID.console 2>&1 &
     PIDVAL=$!
     echo "$SERVERCMD -- $PIDVAL"
     if [ $SERVERID -eq 2 ]; then
-        sleep 15 # This will force a CDE timeout
+        sleep 10 # This will force a CDE timeout
     fi
 done
 
 echo "STARTING GATEWAYS..."
 
-sleep 5
-
 # Start gateways
 for GWID in $(seq 3 -1 1)
 do
     IDX=$(($GWID - 1))
-    GATEWAYCMD="../bin/gateway -i $IDX --config gateway-$GWID.yaml"
+    GATEWAYCMD="../bin/gateway --config gateway-$GWID.yaml"
     $GATEWAYCMD > $GATEWAYLOGS/gateway-$GWID.console 2>&1 &
     PIDVAL=$!
     echo "$GATEWAYCMD -- $PIDVAL"
diff --git a/smokeinfra/server-1.yaml b/smokeinfra/server-1.yaml
index 83ea83dca2e8be803041a5924e849f5f63a15337..d7e9c75c8cff327b3b0146629359a61156b98a90 100644
--- a/smokeinfra/server-1.yaml
+++ b/smokeinfra/server-1.yaml
@@ -4,47 +4,32 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-skipReg: true
-# Log message level
-logLevel: 1
+# registration code used for first time registration. Unique. Provided by xx network
+registrationCode: "qpol"
+useGPU: false
 node:
-    id: ""
     paths:
+        idf:  "nodeID-1.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/server-1.log"
-    addresses:
-        - "localhost:60000"
-        - "localhost:60001"
-        - "localhost:60002"
+        errOutput: "results/server-1.err"
+    port: 60000
+    listeningAddress: "127.0.0.1"
 database:
     name: "node1"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "localhost:9440"
-        - "localhost:9441"
-        - "localhost:9442"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
-  address: "localhost:18000"
-  registrationCode: "AAAA"
-  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
-  e2e:
-    prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
-    smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
-    generator: "2"
+  address: "127.0.0.1:18000"
+metrics:
+  # location of stored metrics data. Modification to set to permissioning
+  # server instead of saving will be made at a later date
+  log:  "results/server-1-metrics.log"
 # === END YAML
diff --git a/smokeinfra/server-2.yaml b/smokeinfra/server-2.yaml
index 84b5cebf9cc8bb643c332c3f50a72e87e647b7b3..2fe45b77cdcce4726a25f57913a7688f0ae09e48 100644
--- a/smokeinfra/server-2.yaml
+++ b/smokeinfra/server-2.yaml
@@ -4,47 +4,32 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-skipReg: true
-# Log message level
-logLevel: 1
+# registration code used for first time registration. Unique. Provided by xx network
+registrationCode: "yiiq"
+useGPU: false
 node:
-    id: ""
     paths:
+        idf:  "nodeID-2.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/server-2.log"
-    addresses:
-        - "localhost:60000"
-        - "localhost:60001"
-        - "localhost:60002"
+        errOutput: "results/server-2.err"
+    port: 60001
+    listeningAddress: "127.0.0.1"
 database:
     name: "node2"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "localhost:9440"
-        - "localhost:9441"
-        - "localhost:9442"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
-  address: "localhost:18000"
-  registrationCode: "BBBB"
-  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
-  e2e:
-    prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
-    smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
-    generator: "2"
+  address: "127.0.0.1:18000"
+metrics:
+  # location of stored metrics data. Modification to set to permissioning
+  # server instead of saving will be made at a later date
+  log:  "results/server-2-metrics.log"
 # === END YAML
diff --git a/smokeinfra/server-3.yaml b/smokeinfra/server-3.yaml
index 2b04541a3a8baa12acd76d3771c9fed1a6e75508..5c5ce4cbe566cbe9abf32849f90047a8b90df925 100644
--- a/smokeinfra/server-3.yaml
+++ b/smokeinfra/server-3.yaml
@@ -4,47 +4,32 @@
 ##                                                                             #
 ## All rights reserved.                                                        #
 ################################################################################
-skipReg: true
-# Log message level
-logLevel: 1
+# registration code used for first time registration. Unique. Provided by xx network
+registrationCode: "vydz"
+useGPU: false
 node:
-    id: ""
     paths:
+        idf:  "nodeID-3.json"
         cert: "../keys/cmix.rip.crt"
         key:  "../keys/cmix.rip.key"
         log:  "results/server-3.log"
-    addresses:
-        - "localhost:60000"
-        - "localhost:60001"
-        - "localhost:60002"
+        errOutput: "results/server-3.err"
+    port: 60002
+    listeningAddress: "127.0.0.1"
 database:
     name: "node3"
     username: "cmix_server"
     password: ""
-    addresses:
-        - ""
-        - ""
-        - ""
-gateways:
+    address: ""
+gateway:
     paths:
         cert: "../keys/cmix.rip.crt"
-    addresses:
-        - "localhost:9440"
-        - "localhost:9441"
-        - "localhost:9442"
 permissioning:
   paths:
     cert: "../keys/cmix.rip.crt"
-  address: "localhost:18000"
-  registrationCode: "CCCC"
-  publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
-groups:
-  cmix:
-    prime: "F6FAC7E480EE519354C058BF856AEBDC43AD60141BAD5573910476D030A869979A7E23F5FC006B6CE1B1D7CDA849BDE46A145F80EE97C21AA2154FA3A5CF25C75E225C6F3384D3C0C6BEF5061B87E8D583BEFDF790ECD351F6D2B645E26904DE3F8A9861CC3EAD0AA40BD7C09C1F5F655A9E7BA7986B92B73FD9A6A69F54EFC92AC7E21D15C9B85A76084D1EEFBC4781B91E231E9CE5F007BC75A8656CBD98E282671C08A5400C4E4D039DE5FD63AA89A618C5668256B12672C66082F0348B6204DD0ADE58532C967D055A5D2C34C43DF9998820B5DFC4C49C6820191CB3EC81062AA51E23CEEA9A37AB523B24C0E93B440FDC17A50B219AB0D373014C25EE8F"
-    smallprime: "D6B35AA395D9287A5530C474D776EA2FCF5B815E89C9DB4C7BB7A9EFB8F3F34B"
-    generator: "B22FDF91EE6BA01BDE4969C1A986EA1F81C4A1795921403F3437D681D05E95167C2F6414CCB74AC8D6B3BA8C0E85C7E4DEB0E8B5256D37BC5C21C8BE068F5342858AFF2FC7FF2644EBED8B10271941C74C86CCD71AA6D2D98E4C8C70875044900F842998037A7DFB9BC63BAF1BC2800E73AF9615E4F5B869D4C6DE6E5F48FACE9CA594CC5D228CB7F763A0AD6BF6ED78B27F902D9ADA38A1FCD7D09E398CE377BB15A459044D3B8541DC6D8049B66AE1662682254E69FAD31CA0016251D0522EF8FE587A3F6E3AB1E5F9D8C2998874ABAB205217E95B234A7D3E69713B884918ADB57360B5DE97336C7DC2EB8A3FEFB0C4290E7A92FF5758529AC45273135427"
-  e2e:
-    prime: "E2EE983D031DC1DB6F1A7A67DF0E9A8E5561DB8E8D49413394C049B7A8ACCEDC298708F121951D9CF920EC5D146727AA4AE535B0922C688B55B3DD2AEDF6C01C94764DAB937935AA83BE36E67760713AB44A6337C20E7861575E745D31F8B9E9AD8412118C62A3E2E29DF46B0864D0C951C394A5CBBDC6ADC718DD2A3E041023DBB5AB23EBB4742DE9C1687B5B34FA48C3521632C4A530E8FFB1BC51DADDF453B0B2717C2BC6669ED76B4BDD5C9FF558E88F26E5785302BEDBCA23EAC5ACE92096EE8A60642FB61E8F3D24990B8CB12EE448EEF78E184C7242DD161C7738F32BF29A841698978825B4111B4BC3E1E198455095958333D776D8B2BEEED3A1A1A221A6E37E664A64B83981C46FFDDC1A45E3D5211AAF8BFBC072768C4F50D7D7803D2D4F278DE8014A47323631D7E064DE81C0C6BFA43EF0E6998860F1390B5D3FEACAF1696015CB79C3F9C2D93D961120CD0E5F12CBB687EAB045241F96789C38E89D796138E6319BE62E35D87B1048CA28BE389B575E994DCA755471584A09EC723742DC35873847AEF49F66E43873"
-    smallprime: "71774C1E818EE0EDB78D3D33EF874D472AB0EDC746A4A099CA6024DBD456676E14C3847890CA8ECE7C90762E8A3393D525729AD849163445AAD9EE9576FB600E4A3B26D5C9BC9AD541DF1B733BB0389D5A25319BE1073C30ABAF3A2E98FC5CF4D6C20908C63151F1714EFA3584326864A8E1CA52E5DEE356E38C6E951F020811EDDAD591F5DA3A16F4E0B43DAD9A7D2461A90B19625298747FD8DE28ED6EFA29D85938BE15E3334F6BB5A5EEAE4FFAAC74479372BC29815F6DE511F562D674904B7745303217DB0F479E924C85C658977224777BC70C2639216E8B0E3B9C7995F94D420B4C4BC412DA088DA5E1F0F0CC22A84ACAC199EBBB6C595F7769D0D0D110D371BF3325325C1CC0E237FEEE0D22F1EA908D57C5FDE0393B4627A86BEBC01E96A793C6F400A523991B18EBF0326F40E0635FD21F78734CC430789C85AE9FF56578B4B00AE5BCE1FCE16C9ECB089066872F8965DB43F55822920FCB3C4E1C744EBCB09C7318CDF3171AEC3D882465145F1C4DABAF4CA6E53AAA38AC2504F6391BA16E1AC39C23D77A4FB3721C39"
-    generator: "2"
+  address: "127.0.0.1:18000"
+metrics:
+  # location of stored metrics data. Modification to set to permissioning
+  # server instead of saving will be made at a later date
+  log:  "results/server-3-metrics.log"
 # === END YAML