diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 202e3cb40a9a49d7551417e656f2a28697a6d2c5..29f76f9e6a648c5a24f75ea5633af72a883c9890 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,10 +70,10 @@ installbinaries:
     - mv gateway.linux64?job=build gateway
     - "chmod +x *"
     - cd ..
-    - bin/server --version
-    - bin/client --version
-    - bin/udb --version
-    - bin/gateway --version
+    - bin/server version
+    - bin/client --version || bin/client version
+    - bin/udb --version || bin/udb version
+    - bin/gateway --version || bin/gateway version
   artifacts:
     when: always
     expire_in: '1 day'
diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
index 9be1b32dd0fbd4d9c6136b7038b1a59d8384353a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/basice2e/clients.goldoutput/client18.txt
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -1,3 +0,0 @@
-Message from 9, Spencer Received: Hello, 18, with E2E Encryption
-Received: Hello, 18, with E2E Encryption
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAk=, Spencer: Hello, 9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt
index f24f5d7143a769875f7eb6468e3d74c72f5cd4cf..c98ed71ba740f2049a7fae7a54187d9e16673765 100644
--- a/basice2e/clients.goldoutput/client42.txt
+++ b/basice2e/clients.goldoutput/client42.txt
@@ -1,2 +1,2 @@
- Hello from Rick42, with E2E Encryption
 Received: Hello from Ben43, with E2E Encryption
+Sent: Hello from Rick42, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt
index 0463ff2a134e3775a7c738ee7b5011790c6250df..a4c82de7eec511c656bd1670bdb94d90af41a5a3 100644
--- a/basice2e/clients.goldoutput/client43.txt
+++ b/basice2e/clients.goldoutput/client43.txt
@@ -1,2 +1,2 @@
- Hello from Ben43, with E2E Encryption
 Received: Hello from Rick42, with E2E Encryption
+Sent: Hello from Ben43, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index bbbbb135dfccb8adebd471a1569d9400ee312cd3..364c8e147346f8bd6719e02d274211cf96195128 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,3 +1,2 @@
 Message from 7, Rick Received: Hello, 4
-Received: Hello, 4
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=, Ben: Hello, 5
+Sending Message to 5, Ben: Hello, 5
diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt
index 356b9a4cba30096034eedd16bf09d4958d2eb0a8..1384be5a4ce630dc90dff84dfb783290f9091de7 100644
--- a/basice2e/clients.goldoutput/client56.txt
+++ b/basice2e/clients.goldoutput/client56.txt
@@ -1,3 +1,2 @@
 Message from 4, Jim Received: Hello, 5
-Received: Hello, 5
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY=, Steph: Hello, 6
+Sending Message to 6, Steph: Hello, 6
diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt
index 5c9fdd177772f3524d5c2fdd2ac0848188c5b5aa..37a4dcdaf58be9e54e1e783937edae2521d579ca 100644
--- a/basice2e/clients.goldoutput/client67.txt
+++ b/basice2e/clients.goldoutput/client67.txt
@@ -1,3 +1,2 @@
 Message from 5, Ben Received: Hello, 6
-Received: Hello, 6
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAc=, Rick: Hello, 7
+Sending Message to 7, Rick: Hello, 7
diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt
index c293c40cca584d480e5baa6805fe9d79e4d5387a..05887b80e1b4ea50b11fbac9fd130315a3e8da2d 100644
--- a/basice2e/clients.goldoutput/client74.txt
+++ b/basice2e/clients.goldoutput/client74.txt
@@ -1,3 +1,2 @@
 Message from 6, Steph Received: Hello, 7
-Received: Hello, 7
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=, Jim: Hello, 4
+Sending Message to 4, Jim: Hello, 4
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
index 1314bc60142526f57bf21bac39fc4060f3b9c38d..43b019ecdd4a252b4921ce0be522b18622c6645a 100644
--- a/basice2e/clients.goldoutput/client9.txt
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -1,3 +1,2 @@
-Message from 18, Bernardo Received: Hello, 9, with E2E Encryption
-Received: Hello, 9, with E2E Encryption
-Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABI=, Bernardo: Hello, 18, with E2E Encryption
+Message from 9, Spencer Received: Hi
+Sending Message to 9, Spencer: Hi
diff --git a/basice2e/run.sh b/basice2e/run.sh
index abfa2b5f277888af089ea0e28da37cc38863d431..9807dbad1db678b4b74eb20c925c31d35571c611 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -97,7 +97,7 @@ runclients() {
             nid=$(((($cid + 1) % 4) + 4))
             eval NICK=\${NICK${cid}}
             # Send a regular message
-            CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -f blob$cid -E email$cid@email.com -i $cid -d $nid -m \"Hello, $nid\""
+            CLIENTCMD="timeout 30s ../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
@@ -121,17 +121,17 @@ runclients
 
 # Register two users and then do UDB search on each other
 echo "REGISTERING AND SEARCHING WITH PRECANNED USERS..."
-CLIENTCMD="timeout 30s ../bin/client  $CLIENTOPTS -f blob9 -E niamh@elixxir.io -i 9 -d 9 -m \"Hi\""
+CLIENTCMD="timeout 30s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client9.log -f blob9 -E niamh@elixxir.io -i 9 -d 9 -m \"Hi\""
 eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -f blob18 -E bernardo@elixxir.io -i 18 -d 9 -s \"niamh@elixxir.io\" --keyParams 3,4,2,1.0,2"
+CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18.log -f blob18 -E bernardo@elixxir.io -i 18 -d 9 -s \"niamh@elixxir.io\" --keyParams 3,4,2,1.0,2"
 eval $CLIENTCMD >> $CLIENTOUT/client18.txt 2>&1 &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -f blob9 -i 9 -d 18 -s \"bernardo@elixxir.io\" --keyParams 3,4,2,1.0,2"
+CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log -f blob9 -i 9 -d 18 -s \"bernardo@elixxir.io\" --keyParams 3,4,2,1.0,2"
 eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -139,11 +139,11 @@ wait $PIDVAL
 
 # Send multiple E2E encrypted messages between users that discovered each other
 echo "SENDING MESSAGES TO PRECANNED USERS AND FORCING A REKAY..."
-CLIENTCMD="timeout 180s ../bin/client $CLIENTOPTS -c 20 -w 20 -i 18 -d 9 -s \"niamh@elixxir.io\" -f blob18 -m \"Hello, 9, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 180s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client18_rekey.log -c 20 -w 20 -i 18 -d 9 -s \"niamh@elixxir.io\" -f blob18 -m \"Hello, 9, with E2E Encryption\" --end2end"
 eval $CLIENTCMD >> $CLIENTOUT/client18_rekey.txt 2>&1 || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 180s ../bin/client $CLIENTOPTS -c 20 -w 20 -i 9 -d 18 -s \"bernardo@elixxir.io\" -f blob9 -m \"Hello, 18, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 180s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9_rekey.log -c 20 -w 20 -i 9 -d 18 -s \"bernardo@elixxir.io\" -f blob9 -m \"Hello, 18, with E2E Encryption\" --end2end"
 eval $CLIENTCMD >> $CLIENTOUT/client9_rekey.txt 2>&1 || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -153,11 +153,11 @@ wait $PIDVAL || true
 
 # Register non-precanned users
 echo "REGISTERING NEW USERS..."
-CLIENTCMD="timeout 30s ../bin/client  $CLIENTOPTS -f blob42 -E rick42@elixxir.io -r FFFF"
+CLIENTCMD="timeout 30s ../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 30s ../bin/client  $CLIENTOPTS -f blob43 -E ben43@elixxir.io -r GGGG"
+CLIENTCMD="timeout 30s ../bin/client  $CLIENTOPTS -l $CLIENTOUT/client43.log -f blob43 -E ben43@elixxir.io -r GGGG"
 eval $CLIENTCMD >> $CLIENTOUT/client43.txt &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -166,11 +166,11 @@ wait $PIDVAL2
 
 # Have each non-precanned user search for each other
 echo "SEARCHING FOR NEW USERS..."
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -f blob42 -s \"ben43@elixxir.io\" --keyParams 3,4,2,1.0,2"
+CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client42.log -f blob42 -s \"ben43@elixxir.io\" --keyParams 3,4,2,1.0,2"
 eval $CLIENTCMD >> $CLIENTOUT/client42.txt &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -f blob43 -s \"rick42@elixxir.io\" --keyParams 3,4,2,1.0,2"
+CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client43.log -f blob43 -s \"rick42@elixxir.io\" --keyParams 3,4,2,1.0,2"
 eval $CLIENTCMD >> $CLIENTOUT/client43.txt &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -179,18 +179,18 @@ wait $PIDVAL2
 
 # Extract generated user name from logs
 echo "EXTRACTING USER IDs FROM LOG FILES..."
-TMPID=$(cat $CLIENTOUT/client42.txt | grep "Successfully registered user" | awk -F' ' '{print $8}')
+TMPID=$(cat $CLIENTOUT/client42.log | grep "Successfully registered user" | awk -F' ' '{print $8}')
 RICKID=${TMPID%?} # remove ! from end
-TMPID=$(cat $CLIENTOUT/client43.txt | grep "Successfully registered user" | awk -F' ' '{print $8}')
+TMPID=$(cat $CLIENTOUT/client43.log | grep "Successfully registered user" | awk -F' ' '{print $8}')
 BENID=${TMPID%?} # remove ! from end
 
 # Non-precanned user messaging
 echo "SENDING E2E MESSAGES TO NEW USERS..."
-CLIENTCMD="timeout 30s ../bin/client $CLIENTOPTS -c 1 -w 1 --dest64 $BENID -s \"ben43@elixxir.io\" -f blob42 -m \"Hello from Rick42, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 30s ../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 30s ../bin/client $CLIENTOPTS -c 1 -w 1 --dest64 $RICKID -s \"rick42@elixxir.io\" -f blob43 -m \"Hello from Ben43, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 30s ../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"
@@ -198,30 +198,13 @@ wait $PIDVAL
 wait $PIDVAL2
 
 
-# FIXME: Go into client and clean up it's output so this is not necessary
-for C in $(ls -1 $CLIENTOUT); do
-    # Remove the [CLIENT] Lines and cut them down
-    strings $CLIENTOUT/$C | grep "\[CLIENT\]" | cut -d\  -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true
-    # Take the clean lines and add them
-    strings $CLIENTOUT/$C | grep -v "\[CLIENT\]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true
-    strings $CLIENTOUT/$C | grep -v "\[CLIENT\]" | cut -d\  -f5- | grep -e "Received\:" >> $CLIENTCLEAN/$C || true
-done
-
-# only expect up to 10c messages from the e2e clients
-head -10 $CLIENTCLEAN/client9_rekey.txt | strings | grep -v "\.\.\." | grep -v "Timestamp" > $CLIENTCLEAN/client9.txt || true
-head -10 $CLIENTCLEAN/client18_rekey.txt | strings | grep -v "\.\.\."  | grep -v "Timestamp" > $CLIENTCLEAN/client18.txt || true
-rm $CLIENTCLEAN/client9_rekey.txt $CLIENTCLEAN/client18_rekey.txt || true
-
+cp $CLIENTOUT/*.txt $CLIENTCLEAN/
 
-strings $CLIENTCLEAN/client42.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client42-clean.txt || true
-strings $CLIENTCLEAN/client43.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client43-clean.txt || true
-strings $CLIENTCLEAN/client74.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client74-clean.txt || true
-mv $CLIENTCLEAN/client42-clean.txt $CLIENTCLEAN/client42.txt
-mv $CLIENTCLEAN/client43-clean.txt $CLIENTCLEAN/client43.txt
-mv $CLIENTCLEAN/client74-clean.txt $CLIENTCLEAN/client74.txt
+# Ignore rekey for now
+rm $CLIENTCLEAN/*_rekey.txt
 
-sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client42.txt
-sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client43.txt
+sed -i 's/Sending\ Message\ to\ .*,\ :/Sent:/g' $CLIENTCLEAN/client4[23].txt
+sed -i 's/Message\ from\ .*, .* Received:/Received:/g' $CLIENTCLEAN/client4[23].txt
 
 for C in $(ls -1 $CLIENTCLEAN); do
     sort -o tmp $CLIENTCLEAN/$C  || true