diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
index 6c5b3a123f85088fdaf06340aa55afd17f60bfca..8750487f6081a54f1f16d1b56eeb5a9f41bb8b87 100644
--- a/basice2e/clients.goldoutput/client18.txt
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -1,2 +1,44 @@
-Received: Hello, 18, with E2E Encryption
-Sending Message to 9, Spencer: Hello, 9, with E2E Encryption
+[CLIENT] WARN 2019/08/23 18:29:56 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:29:56 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:29:56 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:29:56 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:29:56 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:29:56 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:29:56 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:29:56 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:29:56 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:29:56 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:29:56 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:29:56 Registering...
+[CLIENT] INFO 2019/08/23 18:29:56 Attempting to register with code IGOLICLE...
+[CLIENT] INFO 2019/08/23 18:29:59 Registering precanned user...
+[CLIENT] INFO 2019/08/23 18:29:59 Successfully registered user AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABI=!
+[CLIENT] INFO 2019/08/23 18:29:59 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:29:59 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:29:59 Logging in...
+[CLIENT] INFO 2019/08/23 18:29:59 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:59 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:59 Registering user as bernardo@elixxir.io
+[CLIENT] INFO 2019/08/23 18:30:00 Got a message waiting on the gateway: 0EI637XTiMoxArfyHs/RhkRFSDlhd+J5BYjQIebE1LA=
+[CLIENT] INFO 2019/08/23 18:30:00 Adding message ID 0EI637XTiMoxArfyHs/RhkRFSDlhd+J5BYjQIebE1LA= to received message IDs
+[CLIENT] WARN 2019/08/23 18:30:00 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:30:02 Got a message waiting on the gateway: jiOb2YeUhSIBZ5frhwniayB1Bhu0FfcYrnu6bD2WXOw=
+[CLIENT] INFO 2019/08/23 18:30:02 Adding message ID jiOb2YeUhSIBZ5frhwniayB1Bhu0FfcYrnu6bD2WXOw= to received message IDs
+[CLIENT] WARN 2019/08/23 18:30:02 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:30:04 Got a message waiting on the gateway: TcFmhP3PNE/FsGKNu6boBNiwKpA9RzbSmr/9LmtVDS8=
+[CLIENT] INFO 2019/08/23 18:30:04 Adding message ID TcFmhP3PNE/FsGKNu6boBNiwKpA9RzbSmr/9LmtVDS8= to received message IDs
+[CLIENT] WARN 2019/08/23 18:30:04 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:30:05 Got a message waiting on the gateway: jTb6mzr0JiSOWZHmL89Gq9dxpgTCs2DaxTb+UB5pKNI=
+[CLIENT] INFO 2019/08/23 18:30:05 Adding message ID jTb6mzr0JiSOWZHmL89Gq9dxpgTCs2DaxTb+UB5pKNI= to received message IDs
+[CLIENT] INFO 2019/08/23 18:30:05 Registered!
+[CLIENT] INFO 2019/08/23 18:30:05 Logged In!
+[CLIENT] WARN 2019/08/23 18:30:05 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:30:06 Got a message waiting on the gateway: 7PlYLDHB0cMZi0Zx41PM8D3TYefrwkIjsg3ugukm5U8=
+[CLIENT] INFO 2019/08/23 18:30:06 Adding message ID 7PlYLDHB0cMZi0Zx41PM8D3TYefrwkIjsg3ugukm5U8= to received message IDs
+[CLIENT] WARN 2019/08/23 18:30:06 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:30:07 Got a message waiting on the gateway: K0B1yePQko7YOKcPpCF9KYK1d9rRjhPj+FPf6w5CP3M=
+[CLIENT] INFO 2019/08/23 18:30:07 Adding message ID K0B1yePQko7YOKcPpCF9KYK1d9rRjhPj+FPf6w5CP3M= to received message IDs
+[CLIENT] INFO 2019/08/23 18:30:07 Got a message waiting on the gateway: rceARmp3Z/GPJeEWoLVIo386DyLTXOO2id5zunOhHnM=
+[CLIENT] INFO 2019/08/23 18:30:07 Adding message ID rceARmp3Z/GPJeEWoLVIo386DyLTXOO2id5zunOhHnM= to received message IDs
+[CLIENT] WARN 2019/08/23 18:30:07 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:30:07 Found User niamh@elixxir.io at ID: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAk=
diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index b7b5025fa9044d512b291a9ff86fe107aa318b7a..0122bed62ea70cc0f166158f6acfb9424b508092 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,3 +1,75 @@
+[CLIENT] WARN 2019/08/23 18:29:28 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:29:28 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:29:28 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:29:28 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:29:28 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:29:28 Registering...
+[CLIENT] INFO 2019/08/23 18:29:28 Attempting to register with code XYRAUUO6...
+[CLIENT] INFO 2019/08/23 18:29:40 Registering precanned user...
+[CLIENT] INFO 2019/08/23 18:29:40 Successfully registered user AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=!
+[CLIENT] INFO 2019/08/23 18:29:40 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:29:40 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:29:40 Logging in...
+[CLIENT] INFO 2019/08/23 18:29:40 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:40 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:40 Registering user as email4@email.com
+[CLIENT] INFO 2019/08/23 18:29:41 Got a message waiting on the gateway: T1PmoOM2STPflNYqzb1kJUbgLZJ5Wcc/9gVhv7sfwJw=
+[CLIENT] INFO 2019/08/23 18:29:41 Adding message ID T1PmoOM2STPflNYqzb1kJUbgLZJ5Wcc/9gVhv7sfwJw= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:41 Got a message waiting on the gateway: W7iERLtP8OlGKBCKQ697hFJxjUY/mHC29pEqo37vYnU=
+[CLIENT] INFO 2019/08/23 18:29:41 Adding message ID W7iERLtP8OlGKBCKQ697hFJxjUY/mHC29pEqo37vYnU= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:41 Hearing a text message
 Message from 7, Rick Received: Hello, 4
-Received: Hello, 4
+[CLIENT] WARN 2019/08/23 18:29:41 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] WARN 2019/08/23 18:29:41 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:42 Got a message waiting on the gateway: GtHmv5GTiVw2UMyevaN7R83yazsi9HNWp11X6jVfCpM=
+[CLIENT] INFO 2019/08/23 18:29:42 Adding message ID GtHmv5GTiVw2UMyevaN7R83yazsi9HNWp11X6jVfCpM= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:42 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:44 Got a message waiting on the gateway: Ik//nGW900FK2Yq5zVAfGRArHwCj7FWDmQ1/2QhrbRg=
+[CLIENT] INFO 2019/08/23 18:29:44 Adding message ID Ik//nGW900FK2Yq5zVAfGRArHwCj7FWDmQ1/2QhrbRg= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:44 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:45 Got a message waiting on the gateway: aSkTUUeJPN54X1IoEckP62rfgNca47XNcJA+XxWXOLo=
+[CLIENT] INFO 2019/08/23 18:29:45 Adding message ID aSkTUUeJPN54X1IoEckP62rfgNca47XNcJA+XxWXOLo= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:45 Registered!
+[CLIENT] INFO 2019/08/23 18:29:45 Logged In!
 Sending Message to 5, Ben: Hello, 5
+[CLIENT] WARN 2019/08/23 18:29:45 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] WARN 2019/08/23 18:29:46 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:29:46 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:29:46 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:29:46 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:29:46 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:29:46 Skipped Registration, user: &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4]
+[CLIENT] INFO 2019/08/23 18:29:46 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:29:46 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:29:46 Logging in...
+[CLIENT] INFO 2019/08/23 18:29:46 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:46 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:46 Registering user as email4@email.com
+[CLIENT] INFO 2019/08/23 18:29:47 Got a message waiting on the gateway: a2CefUTBEzQe27k+bWvR1W5Gs+JIay/bnlnltqDRQ6c=
+[CLIENT] INFO 2019/08/23 18:29:47 Adding message ID a2CefUTBEzQe27k+bWvR1W5Gs+JIay/bnlnltqDRQ6c= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:47 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:48 Got a message waiting on the gateway: Sb0XG4Ih4QCTh/pko8DbN6b3bcyqy2NyDsffYQHyMLo=
+[CLIENT] INFO 2019/08/23 18:29:48 Adding message ID Sb0XG4Ih4QCTh/pko8DbN6b3bcyqy2NyDsffYQHyMLo= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:48 Got a message waiting on the gateway: ftHyZgq7NzIi6JcaXkZpacXOkxW3zPHPu2bnwZJo810=
+[CLIENT] INFO 2019/08/23 18:29:48 Adding message ID ftHyZgq7NzIi6JcaXkZpacXOkxW3zPHPu2bnwZJo810= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:48 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:48 Registered!
+[CLIENT] INFO 2019/08/23 18:29:48 Logged In!
+Sending Message to 5, Ben: Hello, 5
+[CLIENT] INFO 2019/08/23 18:29:49 Got a message waiting on the gateway: JWw75UqJgHx45ohj19u2i7qg8JCXz5Ud8rq3oWKPLMU=
+[CLIENT] INFO 2019/08/23 18:29:49 Adding message ID JWw75UqJgHx45ohj19u2i7qg8JCXz5Ud8rq3oWKPLMU= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:49 Hearing a text message
+Message from 7, Rick Received: Hello, 4
+[CLIENT] WARN 2019/08/23 18:29:49 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt
index 78d8019c8011f532a932684c754c2da272c80780..aa7abf2a094d609b0aac4e69c9d7822aee613c57 100644
--- a/basice2e/clients.goldoutput/client56.txt
+++ b/basice2e/clients.goldoutput/client56.txt
@@ -1,3 +1,75 @@
+[CLIENT] WARN 2019/08/23 18:29:28 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:29:28 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:29:28 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:29:28 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:29:28 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:29:28 Registering...
+[CLIENT] INFO 2019/08/23 18:29:28 Attempting to register with code UAV6IWD6...
+[CLIENT] INFO 2019/08/23 18:29:31 Registering precanned user...
+[CLIENT] INFO 2019/08/23 18:29:31 Successfully registered user AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=!
+[CLIENT] INFO 2019/08/23 18:29:31 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:29:31 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:29:31 Logging in...
+[CLIENT] INFO 2019/08/23 18:29:31 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:31 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:31 Registering user as email5@email.com
+[CLIENT] INFO 2019/08/23 18:29:33 Got a message waiting on the gateway: ymNF+1fyU/IrBT7f6A5KopTd91gJHUO23r3WPRLCPv4=
+[CLIENT] INFO 2019/08/23 18:29:33 Adding message ID ymNF+1fyU/IrBT7f6A5KopTd91gJHUO23r3WPRLCPv4= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:33 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:35 Got a message waiting on the gateway: 7wumV/zubvaC86y+NTMvY389ALmfc447FgnhsaRnp8Y=
+[CLIENT] INFO 2019/08/23 18:29:35 Adding message ID 7wumV/zubvaC86y+NTMvY389ALmfc447FgnhsaRnp8Y= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:35 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:38 Got a message waiting on the gateway: n33OS0ogSA2hDy2lh6JTKi3pdewqj27AuUztwKtNxDU=
+[CLIENT] INFO 2019/08/23 18:29:38 Adding message ID n33OS0ogSA2hDy2lh6JTKi3pdewqj27AuUztwKtNxDU= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:38 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:40 Got a message waiting on the gateway: 2Z0rZ5bG2MD8thchGm6X0c7JIG7NHrVQUlPKUhmhiyw=
+[CLIENT] INFO 2019/08/23 18:29:40 Adding message ID 2Z0rZ5bG2MD8thchGm6X0c7JIG7NHrVQUlPKUhmhiyw= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:40 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:40 Registered!
+[CLIENT] INFO 2019/08/23 18:29:40 Logged In!
+Sending Message to 6, Steph: Hello, 6
+[CLIENT] INFO 2019/08/23 18:29:45 Got a message waiting on the gateway: J+9p5eS5IGGF7d4EFpZvEFlFpZ9W34+y6yP/sIr+odE=
+[CLIENT] INFO 2019/08/23 18:29:45 Adding message ID J+9p5eS5IGGF7d4EFpZvEFlFpZ9W34+y6yP/sIr+odE= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:45 Hearing a text message
 Message from 4, Jim Received: Hello, 5
-Received: Hello, 5
+[CLIENT] WARN 2019/08/23 18:29:45 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] WARN 2019/08/23 18:29:46 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:29:46 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:29:46 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:29:46 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:29:46 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:29:46 Skipped Registration, user: &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5]
+[CLIENT] INFO 2019/08/23 18:29:46 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:29:46 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:29:46 Logging in...
+[CLIENT] INFO 2019/08/23 18:29:46 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:46 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:46 Registering user as email5@email.com
+[CLIENT] INFO 2019/08/23 18:29:47 Got a message waiting on the gateway: xI/yNEpnWOVcRBjwjTF3e8ZC2ode3nUJ6UUHHvKbFAs=
+[CLIENT] INFO 2019/08/23 18:29:47 Adding message ID xI/yNEpnWOVcRBjwjTF3e8ZC2ode3nUJ6UUHHvKbFAs= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:47 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:48 Got a message waiting on the gateway: MGrAUTla+KZbZIRkg8lHTkFhQczOXdB4+n/3pEOV1nk=
+[CLIENT] INFO 2019/08/23 18:29:48 Adding message ID MGrAUTla+KZbZIRkg8lHTkFhQczOXdB4+n/3pEOV1nk= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:48 Got a message waiting on the gateway: KEWSzATjHI8p/7WOtiM7LK1iVBqm4Z7SVs/6T9Wm3bo=
+[CLIENT] INFO 2019/08/23 18:29:48 Adding message ID KEWSzATjHI8p/7WOtiM7LK1iVBqm4Z7SVs/6T9Wm3bo= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:48 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:48 Registered!
+[CLIENT] INFO 2019/08/23 18:29:48 Logged In!
 Sending Message to 6, Steph: Hello, 6
+[CLIENT] INFO 2019/08/23 18:29:49 Got a message waiting on the gateway: 2dio3Pi4tSLXFE0i1K14Ko5ORkeKs2kfBz4jGsNrhzE=
+[CLIENT] INFO 2019/08/23 18:29:49 Adding message ID 2dio3Pi4tSLXFE0i1K14Ko5ORkeKs2kfBz4jGsNrhzE= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:49 Hearing a text message
+Message from 4, Jim Received: Hello, 5
+[CLIENT] WARN 2019/08/23 18:29:49 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt
index 4139df10d0f6ddd1cc6a76a995aca8ec351c4538..0a83f88c1302b9e67dc2f625bb32f890629dd038 100644
--- a/basice2e/clients.goldoutput/client67.txt
+++ b/basice2e/clients.goldoutput/client67.txt
@@ -1,3 +1,75 @@
+[CLIENT] WARN 2019/08/23 18:29:28 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:29:28 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:29:28 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:29:28 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:29:28 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:29:28 Registering...
+[CLIENT] INFO 2019/08/23 18:29:28 Attempting to register with code XEHCZT5U...
+[CLIENT] INFO 2019/08/23 18:29:30 Registering precanned user...
+[CLIENT] INFO 2019/08/23 18:29:30 Successfully registered user AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY=!
+[CLIENT] INFO 2019/08/23 18:29:30 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:29:30 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:29:30 Logging in...
+[CLIENT] INFO 2019/08/23 18:29:30 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:30 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:30 Registering user as email6@email.com
+[CLIENT] INFO 2019/08/23 18:29:31 Got a message waiting on the gateway: hfCsTzSAL60k5nUPGu36nx8UNZxXIxZeRhNubwHIXrE=
+[CLIENT] INFO 2019/08/23 18:29:31 Adding message ID hfCsTzSAL60k5nUPGu36nx8UNZxXIxZeRhNubwHIXrE= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:31 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:33 Got a message waiting on the gateway: 0dYKpX01sLOtgOuXOiKqnYMC7iZe6ZF6BWUEG4M0giE=
+[CLIENT] INFO 2019/08/23 18:29:33 Adding message ID 0dYKpX01sLOtgOuXOiKqnYMC7iZe6ZF6BWUEG4M0giE= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:33 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:35 Got a message waiting on the gateway: qvZfcsplbGpSAfbZpUETnto9sGPvmygWEK5AeUh2Dws=
+[CLIENT] INFO 2019/08/23 18:29:35 Adding message ID qvZfcsplbGpSAfbZpUETnto9sGPvmygWEK5AeUh2Dws= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:35 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:36 Got a message waiting on the gateway: 6CtzHaUN6PJXdyERCOMSgsN4470dYZu8ZcMmRZ6lycY=
+[CLIENT] INFO 2019/08/23 18:29:36 Adding message ID 6CtzHaUN6PJXdyERCOMSgsN4470dYZu8ZcMmRZ6lycY= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:36 Registered!
+[CLIENT] INFO 2019/08/23 18:29:36 Logged In!
+[CLIENT] WARN 2019/08/23 18:29:36 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+Sending Message to 7, Rick: Hello, 7
+[CLIENT] INFO 2019/08/23 18:29:40 Got a message waiting on the gateway: mg6JWikNTE23oH0dllDe4vehaeMCDbo2fuAnAHwief4=
+[CLIENT] INFO 2019/08/23 18:29:40 Adding message ID mg6JWikNTE23oH0dllDe4vehaeMCDbo2fuAnAHwief4= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:40 Hearing a text message
 Message from 5, Ben Received: Hello, 6
-Received: Hello, 6
+[CLIENT] WARN 2019/08/23 18:29:40 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] WARN 2019/08/23 18:29:46 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:29:46 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:29:46 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:29:46 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:29:46 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:29:46 Skipped Registration, user: &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6]
+[CLIENT] INFO 2019/08/23 18:29:46 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:29:46 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:29:46 Logging in...
+[CLIENT] INFO 2019/08/23 18:29:46 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:46 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:46 Registering user as email6@email.com
+[CLIENT] INFO 2019/08/23 18:29:47 Got a message waiting on the gateway: zEAr0AhzKc85tKPwhR/wUA9H2eMQnciKlWrjC6tFURI=
+[CLIENT] INFO 2019/08/23 18:29:47 Adding message ID zEAr0AhzKc85tKPwhR/wUA9H2eMQnciKlWrjC6tFURI= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:47 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:48 Got a message waiting on the gateway: RQ7A3r63KRxeHPyuzWrQgrgyj0y0UzPNx1EaZfOBtjE=
+[CLIENT] INFO 2019/08/23 18:29:48 Adding message ID RQ7A3r63KRxeHPyuzWrQgrgyj0y0UzPNx1EaZfOBtjE= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:48 Got a message waiting on the gateway: QDpPu5a1flVZE0UATdNX1ekYaBfisYMAn/r3wDUp5lI=
+[CLIENT] INFO 2019/08/23 18:29:48 Adding message ID QDpPu5a1flVZE0UATdNX1ekYaBfisYMAn/r3wDUp5lI= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:48 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:48 Registered!
+[CLIENT] INFO 2019/08/23 18:29:48 Logged In!
 Sending Message to 7, Rick: Hello, 7
+[CLIENT] INFO 2019/08/23 18:29:49 Got a message waiting on the gateway: LwhvT4t6PtjET4KAIb8wca45IYqWQS+Vtlrlehx5yT4=
+[CLIENT] INFO 2019/08/23 18:29:49 Adding message ID LwhvT4t6PtjET4KAIb8wca45IYqWQS+Vtlrlehx5yT4= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:49 Hearing a text message
+Message from 5, Ben Received: Hello, 6
+[CLIENT] WARN 2019/08/23 18:29:49 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt
index 634534eaa2bbe82add4caa1af4fe415db6d90e86..9b15d98b70759621104efd758bef7191e40ce32b 100644
--- a/basice2e/clients.goldoutput/client74.txt
+++ b/basice2e/clients.goldoutput/client74.txt
@@ -1,3 +1,75 @@
+[CLIENT] WARN 2019/08/23 18:29:28 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:29:28 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:29:28 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:29:28 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:29:28 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:29:28 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:29:28 Registering...
+[CLIENT] INFO 2019/08/23 18:29:28 Attempting to register with code BW7NEXOZ...
+[CLIENT] INFO 2019/08/23 18:29:31 Registering precanned user...
+[CLIENT] INFO 2019/08/23 18:29:31 Successfully registered user AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAc=!
+[CLIENT] INFO 2019/08/23 18:29:31 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:29:31 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:29:31 Logging in...
+[CLIENT] INFO 2019/08/23 18:29:31 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:31 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:31 Registering user as email7@email.com
+[CLIENT] INFO 2019/08/23 18:29:32 Got a message waiting on the gateway: kS/NijjrFHoo41ap5hmUwLA4SpiCzpDaMNEVPqaHJfE=
+[CLIENT] INFO 2019/08/23 18:29:32 Adding message ID kS/NijjrFHoo41ap5hmUwLA4SpiCzpDaMNEVPqaHJfE= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:32 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:33 Got a message waiting on the gateway: mZ9omtg01zBNVaZK7fWqXzz8vRcl/V1rvLFo5GK4QIk=
+[CLIENT] INFO 2019/08/23 18:29:33 Adding message ID mZ9omtg01zBNVaZK7fWqXzz8vRcl/V1rvLFo5GK4QIk= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:33 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:35 Got a message waiting on the gateway: lYJ1Dwme7NArA8VoCivZLXn2T5lX1/dECSPvfK7Of+g=
+[CLIENT] INFO 2019/08/23 18:29:35 Adding message ID lYJ1Dwme7NArA8VoCivZLXn2T5lX1/dECSPvfK7Of+g= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:35 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:36 Got a message waiting on the gateway: YMn5J+VmOIf5lhMs6xxD8/06xqHmMtUaej6tIOSjB/8=
+[CLIENT] INFO 2019/08/23 18:29:36 Adding message ID YMn5J+VmOIf5lhMs6xxD8/06xqHmMtUaej6tIOSjB/8= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:36 Got a message waiting on the gateway: ZOXT1osOt0lnVC9+3+p27CWlALYQA7unjmW6L4P6omk=
+[CLIENT] INFO 2019/08/23 18:29:36 Adding message ID ZOXT1osOt0lnVC9+3+p27CWlALYQA7unjmW6L4P6omk= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:36 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:36 Hearing a text message
 Message from 6, Steph Received: Hello, 7
-Received: Hello, 7
+[CLIENT] WARN 2019/08/23 18:29:36 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:36 Registered!
+[CLIENT] INFO 2019/08/23 18:29:36 Logged In!
 Sending Message to 4, Jim: Hello, 4
+[CLIENT] WARN 2019/08/23 18:29:46 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:29:46 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:29:46 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:29:46 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:29:46 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:29:46 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:29:46 Skipped Registration, user: &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7]
+[CLIENT] INFO 2019/08/23 18:29:46 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:29:46 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:29:46 Logging in...
+[CLIENT] INFO 2019/08/23 18:29:46 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:46 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:46 Registering user as email7@email.com
+[CLIENT] INFO 2019/08/23 18:29:47 Got a message waiting on the gateway: SdzBQEHlJvg1H3wrojpJ+TjSgTKOsofOrEgDdaU1G+M=
+[CLIENT] INFO 2019/08/23 18:29:47 Adding message ID SdzBQEHlJvg1H3wrojpJ+TjSgTKOsofOrEgDdaU1G+M= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:47 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:48 Got a message waiting on the gateway: 6rniQrMzLWWvPQNzVn9pyX6mLRixisoGEhSen6RIIWM=
+[CLIENT] INFO 2019/08/23 18:29:48 Adding message ID 6rniQrMzLWWvPQNzVn9pyX6mLRixisoGEhSen6RIIWM= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:48 Got a message waiting on the gateway: 0af8pXyiE/D1wlgETxRqSn2qGvj2akFO2/C7ZFtiVoI=
+[CLIENT] INFO 2019/08/23 18:29:48 Adding message ID 0af8pXyiE/D1wlgETxRqSn2qGvj2akFO2/C7ZFtiVoI= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:48 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:48 Registered!
+[CLIENT] INFO 2019/08/23 18:29:48 Logged In!
+Sending Message to 4, Jim: Hello, 4
+[CLIENT] INFO 2019/08/23 18:29:49 Got a message waiting on the gateway: 8AvS5ED/FhWwwGaPpNCwkO7p2gFPsLJEjWo/8ZKDhbE=
+[CLIENT] INFO 2019/08/23 18:29:49 Adding message ID 8AvS5ED/FhWwwGaPpNCwkO7p2gFPsLJEjWo/8ZKDhbE= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:49 Hearing a text message
+Message from 6, Steph Received: Hello, 7
+[CLIENT] WARN 2019/08/23 18:29:49 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
index 3206400c8bc6f094e33060bce3f6095d260721b1..5d43e6a1a580292a4550a5a5b89e9e097165b387 100644
--- a/basice2e/clients.goldoutput/client9.txt
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -1,2 +1,78 @@
-Received: Hello, 9, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
+[CLIENT] WARN 2019/08/23 18:29:49 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:29:49 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:29:49 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:29:49 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:29:49 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:29:49 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:29:49 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:29:49 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:29:49 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:29:49 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:29:49 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:29:49 Registering...
+[CLIENT] INFO 2019/08/23 18:29:49 Attempting to register with code YRZEM7BW...
+[CLIENT] INFO 2019/08/23 18:29:50 Registering precanned user...
+[CLIENT] INFO 2019/08/23 18:29:50 Successfully registered user AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAk=!
+[CLIENT] INFO 2019/08/23 18:29:50 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:29:50 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:29:50 Logging in...
+[CLIENT] INFO 2019/08/23 18:29:50 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:50 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:29:50 Registering user as niamh@elixxir.io
+[CLIENT] INFO 2019/08/23 18:29:51 Got a message waiting on the gateway: XKrvNP4IFN9XOuf/tPno9Xlgz626hHKN/EN+gjpjvDA=
+[CLIENT] INFO 2019/08/23 18:29:51 Adding message ID XKrvNP4IFN9XOuf/tPno9Xlgz626hHKN/EN+gjpjvDA= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:51 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:52 Got a message waiting on the gateway: uz6I5ppfyjNbKg8o0ojA6XjDqYBLsleHy0CzPha6aFU=
+[CLIENT] INFO 2019/08/23 18:29:52 Adding message ID uz6I5ppfyjNbKg8o0ojA6XjDqYBLsleHy0CzPha6aFU= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:52 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:54 Got a message waiting on the gateway: qq0WvMz2IYh40UVHTjWqjo9++VNN0cXvHRZcawKZUVE=
+[CLIENT] INFO 2019/08/23 18:29:54 Adding message ID qq0WvMz2IYh40UVHTjWqjo9++VNN0cXvHRZcawKZUVE= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:54 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:55 Got a message waiting on the gateway: DtjGojXSmYACbjsja2yQgZV4OmLx0Znnx9Ck4OpQv/c=
+[CLIENT] INFO 2019/08/23 18:29:55 Adding message ID DtjGojXSmYACbjsja2yQgZV4OmLx0Znnx9Ck4OpQv/c= to received message IDs
+[CLIENT] WARN 2019/08/23 18:29:55 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:29:55 Registered!
+[CLIENT] INFO 2019/08/23 18:29:55 Logged In!
+Sending Message to 9, Spencer: Hi
+[CLIENT] INFO 2019/08/23 18:29:56 Got a message waiting on the gateway: EftnyxrxzYeZ8ZFdafgcWJlbcElhkWM9l/pRu+9q0+E=
+[CLIENT] INFO 2019/08/23 18:29:56 Adding message ID EftnyxrxzYeZ8ZFdafgcWJlbcElhkWM9l/pRu+9q0+E= to received message IDs
+[CLIENT] INFO 2019/08/23 18:29:56 Hearing a text message
+Message from 9, Spencer Received: Hi
+[CLIENT] WARN 2019/08/23 18:29:56 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] WARN 2019/08/23 18:30:08 Skipping NDF verification
+[CLIENT] WARN 2019/08/23 18:30:08 Running without signed network definition file
+[CLIENT] INFO 2019/08/23 18:30:08 No storage provided, initializing Client with default storage
+[CLIENT] INFO 2019/08/23 18:30:08 Initialized OS Storage
+[CLIENT] INFO 2019/08/23 18:30:08 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway at 127.0.0.1:8440...
+[CLIENT] INFO 2019/08/23 18:30:08 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=-Gateway at 127.0.0.1:8441...
+[CLIENT] INFO 2019/08/23 18:30:08 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM=-Gateway at 127.0.0.1:8442...
+[CLIENT] INFO 2019/08/23 18:30:08 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=-Gateway at 127.0.0.1:8443...
+[CLIENT] INFO 2019/08/23 18:30:08 Connecting to gateway AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway at 127.0.0.1:8444...
+[CLIENT] INFO 2019/08/23 18:30:08 Connecting to permissioning/registration at 127.0.0.1:18000...
+[CLIENT] INFO 2019/08/23 18:30:08 Connected to permissioning at 127.0.0.1:18000 successfully!
+[CLIENT] INFO 2019/08/23 18:30:08 Skipped Registration, user: &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9]
+[CLIENT] INFO 2019/08/23 18:30:08 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 1, id 1
+[CLIENT] INFO 2019/08/23 18:30:08 Listening now: user &[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], message type 0, id 2
+[CLIENT] INFO 2019/08/23 18:30:08 Logging in...
+[CLIENT] INFO 2019/08/23 18:30:08 Sending gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=-Gateway
+[CLIENT] INFO 2019/08/23 18:30:08 Receiving gateway: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=-Gateway
+[CLIENT] INFO 2019/08/23 18:30:08 Registering user as niamh@elixxir.io
+[CLIENT] INFO 2019/08/23 18:30:09 Got a message waiting on the gateway: 9pjS95To6ysshmPY0S234g7EDHfboYIZgIfMChZiCCs=
+[CLIENT] INFO 2019/08/23 18:30:09 Adding message ID 9pjS95To6ysshmPY0S234g7EDHfboYIZgIfMChZiCCs= to received message IDs
+[CLIENT] WARN 2019/08/23 18:30:09 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:30:10 Got a message waiting on the gateway: RT3IVJKKea82BqZ1msSiltCWraG4qsWNZIyQERoq7H8=
+[CLIENT] INFO 2019/08/23 18:30:10 Adding message ID RT3IVJKKea82BqZ1msSiltCWraG4qsWNZIyQERoq7H8= to received message IDs
+[CLIENT] INFO 2019/08/23 18:30:10 Got a message waiting on the gateway: mrhwjBjID/+4mMdP3d+Qel8MZrtk+Ts5JtBRpqNVaf8=
+[CLIENT] INFO 2019/08/23 18:30:10 Adding message ID mrhwjBjID/+4mMdP3d+Qel8MZrtk+Ts5JtBRpqNVaf8= to received message IDs
+[CLIENT] WARN 2019/08/23 18:30:10 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:30:10 Registered!
+[CLIENT] INFO 2019/08/23 18:30:10 Logged In!
+[CLIENT] INFO 2019/08/23 18:30:11 Got a message waiting on the gateway: nvhkQL6OjdxuWvgk3CjIHMz0pvdNZZWx/4UHDI1pepU=
+[CLIENT] INFO 2019/08/23 18:30:11 Adding message ID nvhkQL6OjdxuWvgk3CjIHMz0pvdNZZWx/4UHDI1pepU= to received message IDs
+[CLIENT] WARN 2019/08/23 18:30:11 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:30:12 Got a message waiting on the gateway: lT7cGLx65ooygquiK6kOCOnzJaF5G1piJNF7A6wTh3o=
+[CLIENT] INFO 2019/08/23 18:30:12 Adding message ID lT7cGLx65ooygquiK6kOCOnzJaF5G1piJNF7A6wTh3o= to received message IDs
+[CLIENT] INFO 2019/08/23 18:30:12 Got a message waiting on the gateway: D3+M44xfptByBEgjl5cSdMNiuteRJUqcXGa0YB3OMKA=
+[CLIENT] INFO 2019/08/23 18:30:12 Adding message ID D3+M44xfptByBEgjl5cSdMNiuteRJUqcXGa0YB3OMKA= to received message IDs
+[CLIENT] WARN 2019/08/23 18:30:12 Received message with NO_TYPE but not Rekey CryptoType, needs to be fixed!
+[CLIENT] INFO 2019/08/23 18:30:12 Found User bernardo@elixxir.io at ID: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABI=