diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverA.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverA.java
deleted file mode 100644
index ddc650fc5fbdce45a80b337cad4e7c015d20b9f0..0000000000000000000000000000000000000000
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverA.java
+++ /dev/null
@@ -1,110 +0,0 @@
-
-import java.net.*;
-import java.util.*;
-
-import edu.nps.moves.disutil.*;
-import edu.nps.moves.dis.*;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-
-/**
- * Receives PDUs from the network in IEEE format.
- *
- * @author DMcG
- * @version $Id:$
- */
-public class ABEspduReceiverA {
-
-    /** Max size of a PDU in binary format that we can receive. This is actually
-     * somewhat outdated--PDUs can be larger--but this is a reasonable starting point
-     */
-    public static final int DIS_DESTINATION_PORT = 3000;
-    public static final int MAX_PDU_SIZE = 8192;
-    public static final String GROUP = "239.1.2.4";
-    public static void main(String args[]) {
-        MulticastSocket socket;
-        DatagramPacket packet;
-        InetAddress address;
-        PduFactory pduFactory = new PduFactory();
-        
-        
-
-        try {
-
-            // Specify the socket to receive data
-            socket = new MulticastSocket(3000);
-            socket.setBroadcast(true);
-       
-            address = InetAddress.getByName(GROUP);
-            socket.joinGroup(address);
-            
-            System.out.println("Joined Group.");
-            // Loop infinitely, receiving datagrams
-            while (true) {
-                try
-                {
-                                    // Create TCP Bridge
-                System.out.println("Opening Bridge.");
-
-                Socket clientConnection = new Socket("localhost", 2999); 
-                OutputStream os = clientConnection.getOutputStream();
-                PrintStream ps = new PrintStream(os);
-
-                //ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                //DataOutputStream dos = new DataOutputStream(baos);
-                System.out.println("Bridging Complete.");
-
-                byte buffer[] = new byte[MAX_PDU_SIZE];
-                packet = new DatagramPacket(buffer, buffer.length);
-
-                socket.receive(packet);
-                System.out.println("Packet Received");
-
-
-                List<Pdu> pduBundle = pduFactory.getPdusFromBundle(packet.getData());
-                System.out.println("Bundle size is " + pduBundle.size());
-                
-                Iterator it = pduBundle.iterator();
-
-                while(it.hasNext())
-                {
-                    Pdu aPdu = (Pdu)it.next();
-                
-                    System.out.print("got PDU of type: " + aPdu.getClass().getName());
-                    if(aPdu instanceof EntityStatePdu)
-                    {
-                        EntityID eid = ((EntityStatePdu)aPdu).getEntityID();
-                        EntityType entityType = ((EntityStatePdu)aPdu).getEntityType();
-                        ps.println(eid.getSite());
-                        ps.println(eid.getApplication());
-                        ps.println(eid.getEntity());
-                        ps.println(entityType.getEntityKind());      // Platform (vs lifeform, munition, sensor, etc.)
-                        ps.println(entityType.getCountry());              // USA
-                        ps.println(entityType.getDomain());          // Land (vs air, surface, subsurface, space)
-                        ps.println(entityType.getCategory());        // Tank
-                        ps.println(entityType.getSubcategory());     // M1 Abrams
-                        ps.println(entityType.getSpec());            // M1A2 Abrams
-                        //ps.println(packet);
-                        Vector3Double position = ((EntityStatePdu)aPdu).getEntityLocation();
-                        System.out.print(" EID:[" + eid.getSite() + ", " + eid.getApplication() + ", " + eid.getEntity() + "] ");
-                        System.out.print(" Location in DIS coordinates: [" + position.getX() + ", " + position.getY() + ", " + position.getZ() + "]");
-                    }
-                    System.out.println();
-                } // end trop through PDU bundle
-                }
-                catch (Exception e) {
-                    System.out.println(e);
-                }
-
-            } // end while
-        } // End try
-        catch (Exception e) {
-
-            System.out.println(e);
-        }
-
-
-    } // end main
-} // end class
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverAtoTCP.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverAtoTCP.java
index fb2bb36f69b87c3832c41ee1c685b8a69262ee61..4e16f4c5a5ba326843c1e52725bcacf99c7d009b 100644
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverAtoTCP.java
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverAtoTCP.java
@@ -12,28 +12,23 @@ import java.io.PrintStream;
 /**
  * Receives PDUs from the network in IEEE format.
  *
- * @author DMcG
- * @version $Id:$
+ * @author Angelopoulos/Blankenbeker
+ * @version 8 MAR 2018
  */
 public class ABEspduReceiverAtoTCP {
 
-    /** Max size of a PDU in binary format that we can receive. This is actually
-     * somewhat outdated--PDUs can be larger--but this is a reasonable starting point
-     */
+    public static final String TCP_DESTINATION_IP = "172.20.146.111";
     public static final int DIS_DESTINATION_PORT = 3000;
     public static final int TCP_DESTINATION_PORT = 2999;
     public static final int MAX_PDU_SIZE = 8192;
     public static final String GROUP = "239.1.2.4";
+    
     public static void main(String args[]) {
         MulticastSocket socket;
         DatagramPacket packet;
         InetAddress address;
         PduFactory pduFactory = new PduFactory();
-        
-        
-
         try {
-
             // Specify the socket to receive data
             socket = new MulticastSocket(DIS_DESTINATION_PORT);
             socket.setBroadcast(true);
@@ -41,75 +36,68 @@ public class ABEspduReceiverAtoTCP {
             address = InetAddress.getByName(GROUP);
             socket.joinGroup(address);
             
-            System.out.println("Joined Group.");
+            //System.out.println("Joined Group.");
             // Loop infinitely, receiving datagrams
             while (true) {
                 try
                 {
 
-                byte buffer[] = new byte[MAX_PDU_SIZE];
-                packet = new DatagramPacket(buffer, buffer.length);
+                    byte buffer[] = new byte[MAX_PDU_SIZE];
+                    packet = new DatagramPacket(buffer, buffer.length);
 
-                socket.receive(packet);
-                System.out.println("Packet Received");
+                    socket.receive(packet);
+                    //System.out.println("Packet Received");
 
+                    List<Pdu> pduBundle = pduFactory.getPdusFromBundle(packet.getData());
+                    //System.out.println("Bundle size is " + pduBundle.size());
 
-                List<Pdu> pduBundle = pduFactory.getPdusFromBundle(packet.getData());
-                System.out.println("Bundle size is " + pduBundle.size());
-                
-                Iterator it = pduBundle.iterator();
+                    Iterator it = pduBundle.iterator();
 
-                while(it.hasNext())
-                {
-                    Pdu aPdu = (Pdu)it.next();
-                
-                   // System.out.print("got PDU of type: " + aPdu.getClass().getName());
-                    if(aPdu instanceof EntityStatePdu)
+                    while(it.hasNext())
                     {
-
-                        EntityID eid = ((EntityStatePdu)aPdu).getEntityID();
-                        if (eid.getSite() == 100){
-                                                                                        // Create TCP Bridge
-                System.out.println("Opening Bridge.");
-
-                Socket clientConnection = new Socket("localhost", TCP_DESTINATION_PORT); 
-                OutputStream os = clientConnection.getOutputStream();
-                PrintStream ps = new PrintStream(os);
-
-                //ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                //DataOutputStream dos = new DataOutputStream(baos);
-                System.out.println("Bridging Complete.");
-
-                        EntityType entityType = ((EntityStatePdu)aPdu).getEntityType();
-                        ps.println(eid.getSite());
-                        ps.println(eid.getApplication());
-                        ps.println(eid.getEntity());
-                        ps.println(entityType.getEntityKind());      // Platform (vs lifeform, munition, sensor, etc.)
-                        ps.println(entityType.getCountry());              // USA
-                        ps.println(entityType.getDomain());          // Land (vs air, surface, subsurface, space)
-                        ps.println(entityType.getCategory());        // Tank
-                        ps.println(entityType.getSubcategory());     // M1 Abrams
-                        ps.println(entityType.getSpec());            // M1A2 Abrams
-                        //ps.println(packet);
-                        Vector3Double position = ((EntityStatePdu)aPdu).getEntityLocation();
-                        System.out.print(" EID:[" + eid.getSite() + ", " + eid.getApplication() + ", " + eid.getEntity() + "] ");
-                        System.out.print(" Location in DIS coordinates: [" + position.getX() + ", " + position.getY() + ", " + position.getZ() + "]");
+                        Pdu aPdu = (Pdu)it.next();
+
+                       // System.out.print("got PDU of type: " + aPdu.getClass().getName());
+                        if(aPdu instanceof EntityStatePdu)
+                        {
+
+                            EntityID eid = ((EntityStatePdu)aPdu).getEntityID();
+                            if (eid.getSite() == 100)
+                            {
+                                // Create TCP Bridge
+                                Socket clientConnection = new Socket(TCP_DESTINATION_IP, TCP_DESTINATION_PORT); 
+                                OutputStream os = clientConnection.getOutputStream();
+                                PrintStream ps = new PrintStream(os);
+                                System.out.println("Alpha Bridging Complete to: " + TCP_DESTINATION_IP);
+                                EntityType entityType = ((EntityStatePdu)aPdu).getEntityType();
+                                ps.println(eid.getSite());
+                                ps.println(eid.getApplication());
+                                ps.println(eid.getEntity());
+                                ps.println(entityType.getEntityKind());      // Platform (vs lifeform, munition, sensor, etc.)
+                                ps.println(entityType.getCountry());              // USA
+                                ps.println(entityType.getDomain());          // Land (vs air, surface, subsurface, space)
+                                ps.println(entityType.getCategory());        // Tank
+                                ps.println(entityType.getSubcategory());     // M1 Abrams
+                                ps.println(entityType.getSpec());            // M1A2 Abrams
+ 
+                            }
+                            Vector3Double location = ((EntityStatePdu)aPdu).getEntityLocation();
+                            System.out.print(" EID:[" + eid.getSite() + ", " + eid.getApplication() + ", " + eid.getEntity() + "] ");
+                            //System.out.print(" Location in DIS coordinates: [" + location.getX() + ", " + location.getY() + ", " + location.getZ() + "]");
+                            double c[] = {location.getX(), location.getY(), location.getZ()};
+                            double lla[] = CoordinateConversions.xyzToLatLonDegrees(c);
+                            System.out.println(" Location (lat/lon/alt): [" + lla[0] + ", " + lla[1] + ", " + lla[2] + "]");
                         }
-                    }
-                    System.out.println();
-                } // end trop through PDU bundle
+                        System.out.println();
+                    } // end trop through PDU bundle
                 }
                 catch (Exception e) {
                     System.out.println(e);
                 }
-
             } // end while
         } // End try
         catch (Exception e) {
-
             System.out.println(e);
         }
-
-
     } // end main
 } // end class
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverB.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverB.java
deleted file mode 100644
index 6b8c30b70966bf4d6e13c653aa5399f5ac285b1e..0000000000000000000000000000000000000000
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverB.java
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
-import java.net.*;
-import java.util.*;
-
-import edu.nps.moves.disutil.*;
-import edu.nps.moves.dis.*;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintStream;
-
-/**
- * Receives PDUs from the network in IEEE format.
- *
- * @author DMcG
- * @version $Id:$
- */
-public class ABEspduReceiverB {
-
-    /** Max size of a PDU in binary format that we can receive. This is actually
-     * somewhat outdated--PDUs can be larger--but this is a reasonable starting point
-     */
-    public static final int MAX_PDU_SIZE = 8192;
-    
-    public static final String GROUP = "239.1.2.4";
-
-    public static void main(String args[]) {
-        MulticastSocket socket;
-        DatagramPacket packet;
-        InetAddress address;
-        PduFactory pduFactory = new PduFactory();
-
-        try {
-            // Specify the socket to receive data
-            socket = new MulticastSocket(3101);
-            socket.setBroadcast(true);
-            //int connectionCount = 0;
-           // ServerSocket serverSocket = new ServerSocket(2999);
-            //Socket clientConnection = serverSocket.accept();
-            
-            //InputStream is = clientConnection.getInputStream();
-            //InputStreamReader isr = new InputStreamReader(is);
-            //BufferedReader br = new BufferedReader(isr);
-
-            address = InetAddress.getByName(GROUP);
-            socket.joinGroup(address);
-
-            // Loop infinitely, receiving datagrams
-            while (true) {
-                byte buffer[] = new byte[MAX_PDU_SIZE];
-                packet = new DatagramPacket(buffer, buffer.length);
-
-                socket.receive(packet);
-                
-                //OutputStream os = clientConnection.getOutputStream();
-               // PrintStream ps = new PrintStream(os);
-               // connectionCount++;
-               // ps.println("This was written by the server");
-                
-               
-           
-                //String serverMessage = br.readLine();
-                //System.out.println("The message the client sent was " + serverMessage);
-                
-                // Print some information locally about the Socket
-                // connection. This includes the port and IP numbers
-                // on both sides (the socket pair.)
-                
-               // InetAddress localAddress = clientConnection.getLocalAddress();
-                //InetAddress remoteAddress = clientConnection.getInetAddress();
-                
-                //int localPort = clientConnection.getLocalPort();
-                //int remotePort = clientConnection.getPort();
-                
-                // My socket pair connection looks like this, to localhost:
-                // Socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 54876 ))
-                // Socket pair: (( /0:0:0:0:0:0:0:1, 2317 ), ( /0:0:0:0:0:0:0:1, 54881 ))
-                //
-                // Why is the first IP/port the same, while the second set has
-                // different ports?
-
-
-                //System.out.println("Socket pair: (( " + localAddress.toString() + ", " + localPort + " ), ( " + 
-                //        remoteAddress.toString() + ", " + remotePort + " ))");
-                
-                //System.out.println("Connection count is: " + connectionCount);
-
-                List<Pdu> pduBundle = pduFactory.getPdusFromBundle(packet.getData());
-                System.out.println("Bundle size is " + pduBundle.size());
-                
-                Iterator it = pduBundle.iterator();
-                
-                
-
-                while(it.hasNext())
-                {
-                    Pdu aPdu = (Pdu)it.next();
-                
-                    System.out.print("got PDU of type: " + aPdu.getClass().getName());
-                    if(aPdu instanceof EntityStatePdu)
-                    {
-                        EntityID eid = ((EntityStatePdu)aPdu).getEntityID();
-                        Vector3Double position = ((EntityStatePdu)aPdu).getEntityLocation();
-                        System.out.print(" EID:[" + eid.getSite() + ", " + eid.getApplication() + ", " + eid.getEntity() + "] ");
-                        System.out.print(" Location in DIS coordinates: [" + position.getX() + ", " + position.getY() + ", " + position.getZ() + "]");
-                    }
-                    System.out.println();
-                } // end trop through PDU bundle
-
-            } // end while
-        } // End try
-        catch (Exception e) {
-
-            System.out.println(e);
-        }
-
-
-    } // end main
-} // end class
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduReceiverAtoTCP.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduReceiverAtoTCP.java
new file mode 100644
index 0000000000000000000000000000000000000000..bd5488fadfb731d1d15c754e4b108d890454925c
--- /dev/null
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduReceiverAtoTCP.java
@@ -0,0 +1,104 @@
+
+import java.net.*;
+import java.util.*;
+
+import edu.nps.moves.disutil.*;
+import edu.nps.moves.dis.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+
+/**
+ * Receives PDUs from the network creates a TCP connection, then 
+ * sends information to through the connection.
+ *
+ * @author Angelopoulos/Blankenbeker
+ * @version 8 MAR 2018
+ */
+public class AngelBlankEspduReceiverAtoTCP {
+
+    public static final String TCP_DESTINATION_IP = "172.20.146.111";
+    public static final int DIS_DESTINATION_PORT = 3000;
+    public static final int TCP_DESTINATION_PORT = 2999;
+    public static final int MAX_PDU_SIZE = 8192;
+    public static final String GROUP = "239.1.2.4";
+    
+    public static void main(String args[]) {
+        MulticastSocket socket;
+        DatagramPacket packet;
+        InetAddress address;
+        PduFactory pduFactory = new PduFactory();
+        try {
+            // Specify the socket to receive data
+            socket = new MulticastSocket(DIS_DESTINATION_PORT);
+            socket.setBroadcast(true);
+       
+            address = InetAddress.getByName(GROUP);
+            socket.joinGroup(address);
+            
+            //System.out.println("Joined Group.");
+            // Loop infinitely, receiving datagrams
+            while (true) {
+                try
+                {
+
+                    byte buffer[] = new byte[MAX_PDU_SIZE];
+                    packet = new DatagramPacket(buffer, buffer.length);
+
+                    socket.receive(packet);
+                    //System.out.println("Packet Received");
+
+                    List<Pdu> pduBundle = pduFactory.getPdusFromBundle(packet.getData());
+                    //System.out.println("Bundle size is " + pduBundle.size());
+
+                    Iterator it = pduBundle.iterator();
+
+                    while(it.hasNext())
+                    {
+                        Pdu aPdu = (Pdu)it.next();
+
+                       // System.out.print("got PDU of type: " + aPdu.getClass().getName());
+                        if(aPdu instanceof EntityStatePdu)
+                        {
+
+                            EntityID eid = ((EntityStatePdu)aPdu).getEntityID();
+                            if (eid.getSite() == 100)
+                            {
+                                // Create TCP Bridge
+                                Socket clientConnection = new Socket(TCP_DESTINATION_IP, TCP_DESTINATION_PORT); 
+                                OutputStream os = clientConnection.getOutputStream();
+                                PrintStream ps = new PrintStream(os);
+                                System.out.println("Alpha Bridging Complete to: " + TCP_DESTINATION_IP);
+                                EntityType entityType = ((EntityStatePdu)aPdu).getEntityType();
+                                ps.println(eid.getSite());
+                                ps.println(eid.getApplication());
+                                ps.println(eid.getEntity());
+                                ps.println(entityType.getEntityKind());      // Platform (vs lifeform, munition, sensor, etc.)
+                                ps.println(entityType.getCountry());              // USA
+                                ps.println(entityType.getDomain());          // Land (vs air, surface, subsurface, space)
+                                ps.println(entityType.getCategory());        // Tank
+                                ps.println(entityType.getSubcategory());     // M1 Abrams
+                                ps.println(entityType.getSpec());            // M1A2 Abrams
+ 
+                            }
+                            Vector3Double location = ((EntityStatePdu)aPdu).getEntityLocation();
+                            System.out.print(" EID:[" + eid.getSite() + ", " + eid.getApplication() + ", " + eid.getEntity() + "] ");
+                            //System.out.print(" Location in DIS coordinates: [" + location.getX() + ", " + location.getY() + ", " + location.getZ() + "]");
+                            double c[] = {location.getX(), location.getY(), location.getZ()};
+                            double lla[] = CoordinateConversions.xyzToLatLonDegrees(c);
+                            System.out.println(" Location (lat/lon/alt): [" + lla[0] + ", " + lla[1] + ", " + lla[2] + "]");
+                        }
+                        System.out.println();
+                    } // end trop through PDU bundle
+                }
+                catch (Exception e) {
+                    System.out.println(e);
+                }
+            } // end while
+        } // End try
+        catch (Exception e) {
+            System.out.println(e);
+        }
+    } // end main
+} // end class
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduReceiverAtoTCPTest.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduReceiverAtoTCPTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4013c3ede4b10b06eee35ade911815f06e4addd3
--- /dev/null
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduReceiverAtoTCPTest.java
@@ -0,0 +1,112 @@
+
+import java.net.*;
+import java.util.*;
+
+import edu.nps.moves.disutil.*;
+import edu.nps.moves.dis.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+
+/**
+ * Receives PDUs from the network creates a TCP connection, then 
+ * sends information to through the connection.
+ *
+ * @author Angelopoulos/Blankenbeker
+ * @version 8 MAR 2018
+ */
+public class AngelBlankEspduReceiverAtoTCPTest {
+
+    public static final String TCP_DESTINATION_IP = "172.20.146.111";
+    public static final int DIS_DESTINATION_PORT = 3000;
+    public static final int TCP_DESTINATION_PORT = 2999;
+    public static final int MAX_PDU_SIZE = 8192;
+    public static final String GROUP = "239.1.2.4";
+    
+    public static void main(String args[]) {
+        MulticastSocket socket;
+        DatagramSocket dataGram;
+        DatagramPacket packet;
+        InetAddress address;
+        PduFactory pduFactory = new PduFactory();
+        try {
+            // Specify the socket to receive data
+            socket = new MulticastSocket(DIS_DESTINATION_PORT);
+            socket.setBroadcast(true);
+       
+            address = InetAddress.getByName(GROUP);
+            socket.joinGroup(address);
+            
+            //System.out.println("Joined Group.");
+            // Loop infinitely, receiving datagrams
+            while (true) {
+                try
+                {
+
+                    byte buffer[] = new byte[MAX_PDU_SIZE];
+                    packet = new DatagramPacket(buffer, buffer.length);
+
+                    socket.receive(packet);
+                    //System.out.println("Packet Received");
+
+                    List<Pdu> pduBundle = pduFactory.getPdusFromBundle(packet.getData());
+                    //System.out.println("Bundle size is " + pduBundle.size());
+
+                    Iterator it = pduBundle.iterator();
+
+                    while(it.hasNext())
+                    {
+                        Pdu aPdu = (Pdu)it.next();
+
+                       // System.out.print("got PDU of type: " + aPdu.getClass().getName());
+                        if(aPdu instanceof EntityStatePdu)
+                        {
+
+                            EntityID eid = ((EntityStatePdu)aPdu).getEntityID();
+                            if (eid.getSite() == 100)
+                            {
+                                dataGram = new DatagramSocket();
+                                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                                DataOutputStream dos = new DataOutputStream(baos);  
+                                aPdu.marshal(dos);
+                                byte[] data = baos.toByteArray();
+                                
+                                DatagramPacket DpSend =  new DatagramPacket(data, data.length,  InetAddress.getByName(TCP_DESTINATION_IP), TCP_DESTINATION_PORT);
+                                dataGram.send(DpSend);
+                                //Socket clientConnection = new Socket(TCP_DESTINATION_IP, TCP_DESTINATION_PORT); 
+                                //OutputStream os = clientConnection.getOutputStream();
+                                //PrintStream ps = new PrintStream(os);
+                                System.out.println("Alpha Bridging Complete to: " + TCP_DESTINATION_IP);
+                                EntityType entityType = ((EntityStatePdu)aPdu).getEntityType();
+                                /**ps.println(eid.getSite());
+                                ps.println(eid.getApplication());
+                                ps.println(eid.getEntity());
+                                ps.println(entityType.getEntityKind());      // Platform (vs lifeform, munition, sensor, etc.)
+                                ps.println(entityType.getCountry());              // USA
+                                ps.println(entityType.getDomain());          // Land (vs air, surface, subsurface, space)
+                                ps.println(entityType.getCategory());        // Tank
+                                ps.println(entityType.getSubcategory());     // M1 Abrams
+                                ps.println(entityType.getSpec());            // M1A2 Abrams**/
+ 
+                            }
+                            Vector3Double location = ((EntityStatePdu)aPdu).getEntityLocation();
+                            System.out.print(" EID:[" + eid.getSite() + ", " + eid.getApplication() + ", " + eid.getEntity() + "] ");
+                            //System.out.print(" Location in DIS coordinates: [" + location.getX() + ", " + location.getY() + ", " + location.getZ() + "]");
+                            double c[] = {location.getX(), location.getY(), location.getZ()};
+                            double lla[] = CoordinateConversions.xyzToLatLonDegrees(c);
+                            System.out.println(" Location (lat/lon/alt): [" + lla[0] + ", " + lla[1] + ", " + lla[2] + "]");
+                        }
+                        System.out.println();
+                    } // end trop through PDU bundle
+                }
+                catch (Exception e) {
+                    System.out.println(e);
+                }
+            } // end while
+        } // End try
+        catch (Exception e) {
+            System.out.println(e);
+        }
+    } // end main
+} // end class
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduSenderA.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduSenderA.java
index c3fdd6285cd54219ff8a4be5c58639f27025c2ca..7140be6af48fffd9a198f54223ad4a4ee2ed55f0 100644
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduSenderA.java
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduSenderA.java
@@ -8,9 +8,10 @@ import edu.nps.moves.disutil.CoordinateConversions;
 import edu.nps.moves.disutil.DisTime;
 
 /**
- * Creates and sends ESPDUs in IEEE binary format. 
+ * Emits PDUs from the network in IEEE format.
  *
- * @author DMcG
+ * @author Angelopoulos/Blankenbeker
+ * @version 8 MAR 2018
  */
 public class AngelBlankEspduSenderA 
 {
@@ -40,14 +41,9 @@ public static void main(String args[])
     MulticastSocket socket = null;
     DisTime disTime = DisTime.getInstance();
     int alternator = -1;
-    
     // ICBM coordinates for my office
     double lat = 36.595517; 
     double lon = -121.877000;
-
-    
-    // Default settings. These are used if no system properties are set. 
-    // If system properties are passed in, these are over ridden.
     int port = DIS_DESTINATION_PORT;
     NetworkMode mode = NetworkMode.MULTICAST;
     InetAddress destinationIp = null;
@@ -64,16 +60,12 @@ public static void main(String args[])
     
     // All system properties, passed in on the command line via -Dattribute=value
     Properties systemProperties = System.getProperties();
-    
     // IP address we send to
     String destinationIpString = systemProperties.getProperty("destinationIp");
-    
     // Port we send to, and local port we open the socket on
     String portString = systemProperties.getProperty("port");
-    
     // Network mode: unicast, multicast, broadcast
     String networkModeString = systemProperties.getProperty("networkMode"); // unicast or multicast or broadcast
-        
 
     // Set up a socket to send information
     try
@@ -104,9 +96,7 @@ public static void main(String args[])
                 {
                     throw new RuntimeException("Sending to multicast address, but destination address " + destinationIp.toString() + "is not multicast");
                 }
-                
-                socket.joinGroup(destinationIp);
-                
+                socket.joinGroup(destinationIp);   
             }
         } // end networkModeString
     }
@@ -116,159 +106,46 @@ public static void main(String args[])
         System.out.println(e);
         System.exit(-1);
     }
-    
-    // Initialize values in the Entity State PDU object. The exercise ID is 
-    // a way to differentiate between different virtual worlds on one network.
-    // Note that some values (such as the PDU type and PDU family) are set
-    // automatically when you create the ESPDU.
-    espdu.setExerciseID((short)1);
-    
-    // The EID is the unique identifier for objects in the world. This 
-    // EID should match up with the ID for the object specified in the 
-    // VMRL/x3d/virtual world.
-    EntityID eid = espdu.getEntityID();
-    eid.setSite(100);  // 0 is apparently not a valid site number, per the spec
-    eid.setApplication(1); 
-    eid.setEntity(2); 
-    
-    // Set the entity type. SISO has a big list of enumerations, so that by
-    // specifying various numbers we can say this is an M1A2 American tank,
-    // the USS Enterprise, and so on. We'll make this a tank. There is a 
-    // separate project elsehwhere in this project that implements DIS 
-    // enumerations in C++ and Java, but to keep things simple we just use
-    // numbers here.
-    EntityType entityType = espdu.getEntityType();
-    entityType.setEntityKind((short)1);      // Platform (vs lifeform, munition, sensor, etc.)
-    entityType.setCountry(225);              // USA
-    entityType.setDomain((short)1);          // Land (vs air, surface, subsurface, space)
-    entityType.setCategory((short)1);        // Tank
-    entityType.setSubcategory((short)1);     // M1 Abrams
-    entityType.setSpec((short)3);            // M1A2 Abrams
-    
-
-    //Set<InetAddress> bcastAddresses = getBroadcastAddresses();
-    // Loop through sending N ESPDUs
+        espdu.setExerciseID((short)1);
+        EntityID eid = espdu.getEntityID();
+        eid.setSite(100);  // 0 is apparently not a valid site number, per the spec
+        eid.setApplication(1); 
+        eid.setEntity(2); 
+        EntityType entityType = espdu.getEntityType();
+        entityType.setEntityKind((short)1);      // Platform (vs lifeform, munition, sensor, etc.)
+        entityType.setCountry(225);              // USA
+        entityType.setDomain((short)1);          // Land (vs air, surface, subsurface, space)
+        entityType.setCategory((short)1);        // Tank
+        entityType.setSubcategory((short)1);     // M1 Abrams
+        entityType.setSpec((short)3);            // M1A2 Abrams
     try
     {
-        int connectionCount = 0;
-        //Socket socketTcp = new Socket("localhost", 2998); 
-        //ServerSocket serverSocket = new ServerSocket(2999);
-        
-        
-        //InputStream is = socketTcp.getInputStream();
-        //InputStreamReader isr = new InputStreamReader(is);
-        //BufferedReader br = new BufferedReader(isr);
         System.out.println("Sending " + NUMBER_TO_SEND + " ESPDU packets to " + destinationIp.toString());
         for(int idx = 0; idx < NUMBER_TO_SEND; idx++)
         {
             eid.setEntity(idx+1);
-            // DIS time is a pain in the ass. DIS time units are 2^31-1 units per
-            // hour, and time is set to DIS time units from the top of the hour. 
-            // This means that if you start sending just before the top of the hour
-            // the time units can roll over to zero as you are sending. The receivers
-            // (escpecially homegrown ones) are often not able to detect rollover
-            // and may start discarding packets as dupes or out of order. We use
-            // an NPS timestamp here, hundredths of a second since the start of the
-            // year. The DIS standard for time is often ignored in the wild; I've seen
-            // people use Unix time (seconds since 1970) and more. Or you can
-            // just stuff idx into the timestamp field to get something that is monotonically
-            // increasing.
-            
-            // Note that timestamp is used to detect duplicate and out of order packets. 
-            // That means if you DON'T change the timestamp, many implementations will simply
-            // discard subsequent packets that have an identical timestamp. Also, if they
-            // receive a PDU with an timestamp lower than the last one they received, they
-            // may discard it as an earlier, out-of-order PDU. So it is a good idea to
-            // update the timestamp on ALL packets sent.
-            
-
-            // An alterative approach: actually follow the standard. It's a crazy concept,
-            // but it might just work.
             int ts = disTime.getDisAbsoluteTimestamp();
             espdu.setTimestamp(ts);
-            
-            // Set the position of the entity in the world. DIS uses a cartesian 
-            // coordinate system with the origin at the center of the earth, the x
-            // axis out at the equator and prime meridian, y out at the equator and
-            // 90 deg east, and z up and out the north pole. To place an object on
-            // the earth's surface you also need a model for the shape of the earth
-            // (it's not a sphere.) All the fancy math necessary to do this is in
-            // the SEDRIS SRM package. There are also some one-off formulas for 
-            // doing conversions from, for example, lat/lon/altitude to DIS coordinates.
-            // Here we use those one-off formulas.
-
-            // Modify the position of the object. This will send the object a little
-            // due east by adding some to the longitude every iteration. Since we
-            // are on the Pacific coast, this sends the object east. Assume we are
-            // at zero altitude. In other worlds you'd use DTED to determine the
-            // local ground altitude at that lat/lon, or you'd just use ground clamping.
-            // The x and y values will change, but the z value should not.
-            
-            //lon = lon + (double)((double)idx / 100000.0);
-            //System.out.println("lla=" + lat + "," + lon + ", 0.0");
-
             double direction = Math.pow((double)(-1.0), (double)(idx));
             lon = lon + (direction * 0.00006);
-            //System.out.println(lon);
-            
             double disCoordinates[] = CoordinateConversions.getXYZfromLatLonDegrees(lat, lon, 1.0);
             Vector3Double location = espdu.getEntityLocation();
             location.setX(disCoordinates[0]);
             location.setY(disCoordinates[1]);
             location.setZ(disCoordinates[2]);
-            //System.out.println("lat, lon:" + lat + ", " + lon);
-            //System.out.println("DIS coord:" + disCoordinates[0] + ", " + disCoordinates[1] + ", " + disCoordinates[2]);
-
-            // Optionally, we can do some rotation of the entity
-            /*
-            Orientation orientation = espdu.getEntityOrientation();
-            float psi = orientation.getPsi();
-            psi = psi + idx;
-            orientation.setPsi(psi);
-            orientation.setTheta((float)(orientation.getTheta() + idx /2.0));
-             */
-            
-            // You can set other ESPDU values here, such as the velocity, acceleration,
-            // and so on.
-
-            // Marshal out the espdu object to a byte array, then send a datagram
-            // packet with that data in it.
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             DataOutputStream dos = new DataOutputStream(baos);
             espdu.marshal(dos);
-
-            //FirePdu fire = new FirePdu();
-            //byte[] fireArray = fire.marshal();
-              
-                
-            // The byte array here is the packet in DIS format. We put that into a 
-            // datagram and send it.
             byte[] data = baos.toByteArray();
             DatagramPacket packet = new DatagramPacket(data, data.length, InetAddress.getByName(DEFAULT_MULTICAST_GROUP), DIS_DESTINATION_PORT);
             socket.send(packet);
-            /**bcastAddresses = getBroadcastAddresses();
-            Iterator it = bcastAddresses.iterator();
-            while(it.hasNext())
-            {
-               InetAddress bcast = (InetAddress)it.next();
-               System.out.println("Sending bcast to " + bcast);
-               DatagramPacket packet = new DatagramPacket(data, data.length, bcast, DIS_DESTINATION_PORT);
-               socket.send(packet);
-               //packet = new DatagramPacket(fireArray, fireArray.length, bcast, DIS_DESTINATION_PORT);
-               //socket.send(packet);
-            }**/
-            
-            // Send every 1 sec. Otherwise this will be all over in a fraction of a second.
             Thread.sleep(3000);
-
             location = espdu.getEntityLocation();
-            
             System.out.println("Espdu #" + idx + " EID=[" + eid.getSite() + "," + eid.getApplication() + "," + eid.getEntity() + "]");
-            System.out.println(" DIS coordinates location=[" + location.getX() + "," + location.getY() + "," + location.getZ() + "]");
-            //double c[] = {location.getX(), location.getY(), location.getZ()};
-            //double lla[] = CoordinateConversions.xyzToLatLonDegrees(c);
-//          System.out.println(" Location (lat/lon/alt): [" + lla[0] + ", " + lla[1] + ", " + lla[2] + "]");
-
+            //System.out.println(" DIS coordinates location=[" + location.getX() + "," + location.getY() + "," + location.getZ() + "]");
+            double c[] = {location.getX(), location.getY(), location.getZ()};
+            double lla[] = CoordinateConversions.xyzToLatLonDegrees(c);
+            System.out.println(" Location (lat/lon/alt): [" + lla[0] + ", " + lla[1] + ", " + lla[2] + "]");
         }
     }
     catch(Exception e)
@@ -289,7 +166,7 @@ public static void main(String args[])
     * also pick up a 192.168 address assigned to the VM by the host OS.
     * 
     * @return set of all bcast addresses
-    */
+   
    public static Set<InetAddress> getBroadcastAddresses()
    {
        Set<InetAddress> bcastAddresses = new HashSet<InetAddress>();
@@ -329,5 +206,5 @@ public static void main(String args[])
        
        return bcastAddresses;   
    }
-
+**/
 }
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverBSenderA.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverBSenderA.java
index a0eb8fa25cf0729f95a51b83ee0911723617b400..d984017af24cc1c8ce17a6dc231629fcf584a703 100644
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverBSenderA.java
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverBSenderA.java
@@ -7,9 +7,10 @@ import edu.nps.moves.dis.*;
 import edu.nps.moves.disutil.DisTime;
 
 /**
- * Creates and sends ESPDUs in IEEE binary format. 
+ * listens for TCP connection from AngelBlankReceiverAtoTCP and sends ESPDU in IEEE binary format. 
  *
- * @author DMcG
+ * @author Angelopoulos/Blankenbeker
+ * @version 8 MAR 2018
  */
 public class AngelBlankEspduTCPReceiverBSenderA
 {
@@ -22,16 +23,7 @@ public class AngelBlankEspduTCPReceiverBSenderA
     public static final int TCP_DESTINATION_PORT = 2998;
     /** Port we send on */
     public static final int DIS_DESTINATION_PORT = 3000;
-    
-/** Possible system properties, passed in via -Dattr=val
-     * networkMode: unicast, broadcast, multicast
-     * destinationIp: where to send the packet. If in multicast mode, this can be mcast.
-     *                To determine bcast destination IP, use an online bcast address
-     *                caclulator, for example http://www.remotemonitoringsystems.ca/broadcast.php
-     *                If in mcast mode, a join() will be done on the mcast address.
-     * port: port used for both source and destination.
-     * @param args 
-     */
+
 public static void main(String args[])
 {
     /** an entity state pdu */
@@ -40,13 +32,6 @@ public static void main(String args[])
     DisTime disTime = DisTime.getInstance();
     int alternator = -1;
     
-    // ICBM coordinates for my office
-//    double lat = 36.595517; 
-//    double lon = -121.877000;
-
-    
-    // Default settings. These are used if no system properties are set. 
-    // If system properties are passed in, these are over ridden.
     int port = DIS_DESTINATION_PORT;
     NetworkMode mode = NetworkMode.MULTICAST;
     InetAddress destinationIp = null;
@@ -72,8 +57,6 @@ public static void main(String args[])
     
     // Network mode: unicast, multicast, broadcast
     String networkModeString = systemProperties.getProperty("networkMode"); // unicast or multicast or broadcast
-        
-
     // Set up a socket to send information
     try
     {
@@ -119,18 +102,20 @@ public static void main(String args[])
 
     try
     {
-        //int connectionCount = 0;
+        int connectionCount = 0;
         ServerSocket serverSocket = new ServerSocket(TCP_DESTINATION_PORT);
 
         while(true){
             try
             {
                 Socket clientConnection = serverSocket.accept();
-                System.out.println("RA SB received TCP connection.");
+                connectionCount++;
+                System.out.println("Current PDUs transferred over TCP: " + connectionCount);
+                //System.out.println("RB SA received TCP connection.");
                 InputStream is = clientConnection.getInputStream();
                 InputStreamReader isr = new InputStreamReader(is);
                 BufferedReader br = new BufferedReader(isr);
-                System.out.println("RA SB waiting to readline.");
+                //System.out.println("RB SA waiting to readline.");
                 int entitySite = Integer.parseInt(br.readLine());
                 int entityApplication = Integer.parseInt(br.readLine());
                 int entityEntity = Integer.parseInt(br.readLine());
@@ -140,29 +125,12 @@ public static void main(String args[])
                 short entityCategory = Short.parseShort(br.readLine());
                 short entitySubcategory = Short.parseShort(br.readLine());
                 short entitySpec = Short.parseShort(br.readLine());
-                System.out.println("RA SB reading complete.");
-                // Initialize values in the Entity State PDU object. The exercise ID is 
-                // a way to differentiate between different virtual worlds on one network.
-                // Note that some values (such as the PDU type and PDU family) are set
-                // automatically when you create the ESPDU.
+                //System.out.println("RB SA reading complete.");
                 espdu.setExerciseID((short)1);
-
-                // The EID is the unique identifier for objects in the world. This 
-                // EID should match up with the ID for the object specified in the 
-                // VMRL/x3d/virtual world.
-                
-                
                 EntityID eid = espdu.getEntityID();
                 eid.setSite(entitySite);  // 0 is apparently not a valid site number, per the spec
                 eid.setApplication(entityApplication); 
                 eid.setEntity(entityEntity);
-
-                // Set the entity type. SISO has a big list of enumerations, so that by
-                // specifying various numbers we can say this is an M1A2 American tank,
-                // the USS Enterprise, and so on. We'll make this a tank. There is a 
-                // separate project elsehwhere in this project that implements DIS 
-                // enumerations in C++ and Java, but to keep things simple we just use
-                // numbers here.
                 EntityType entityType = espdu.getEntityType();
                 entityType.setEntityKind(entityEntityKind);      // Platform (vs lifeform, munition, sensor, etc.)
                 entityType.setCountry(entityCountry);              // USA
@@ -170,62 +138,18 @@ public static void main(String args[])
                 entityType.setCategory(entityCategory);        // Tank
                 entityType.setSubcategory(entitySubcategory);     // M1 Abrams
                 entityType.setSpec(entitySpec);            // M1A2 Abrams
-
-
-                //Set<InetAddress> bcastAddresses = getBroadcastAddresses();
-                // Loop through sending N ESPDUs
-                
-                
-                
                 int ts = disTime.getDisAbsoluteTimestamp();
                 espdu.setTimestamp(ts);
-
-//                double direction = Math.pow((double)(-1.0), (double)(idx));
-//                lon = lon + (direction * 0.00006);
-//                System.out.println(lon);
-//
-//                double disCoordinates[] = CoordinateConversions.getXYZfromLatLonDegrees(lat, lon, 1.0);
-//                Vector3Double location = espdu.getEntityLocation();
-//                location.setX(disCoordinates[0]);
-//                location.setY(disCoordinates[1]);
-//                location.setZ(disCoordinates[2]);
-//                System.out.println("lat, lon:" + lat + ", " + lon);
-//                System.out.println("DIS coord:" + disCoordinates[0] + ", " + disCoordinates[1] + ", " + disCoordinates[2]);
-
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 DataOutputStream dos = new DataOutputStream(baos);
                 espdu.marshal(dos);
 
-                //FirePdu fire = new FirePdu();
-                //byte[] fireArray = fire.marshal();
-
                 // The byte array here is the packet in DIS format. We put that into a 
                 // datagram and send it.
                 byte[] data = baos.toByteArray();
                 DatagramPacket packet = new DatagramPacket(data, data.length, InetAddress.getByName(DEFAULT_MULTICAST_GROUP), DIS_DESTINATION_PORT);
-                socket.send(packet);
-                
-                /**bcastAddresses = getBroadcastAddresses();
-                Iterator it = bcastAddresses.iterator();
-                while(it.hasNext())
-                {
-                   InetAddress bcast = (InetAddress)it.next();
-                   System.out.println("RA SB Sending bcast to " + bcast + "EntityID: " + eid.getEntity());
-                   DatagramPacket packet = new DatagramPacket(data, data.length, bcast, DIS_DESTINATION_PORT);
-                   socket.send(packet);
-                   //packet = new DatagramPacket(fireArray, fireArray.length, bcast, DIS_DESTINATION_PORT);
-                   //socket.send(packet);
-                }**/
-
-                // Send every 1 sec. Otherwise this will be all over in a fraction of a second.
-                //Thread.sleep(3000);
-
-//                location = espdu.getEntityLocation();          
+                socket.send(packet);        
                 System.out.println(" EID=[" + eid.getSite() + "," + eid.getApplication() + "," + eid.getEntity() + "]");
-//                System.out.println(" DIS coordinates location=[" + location.getX() + "," + location.getY() + "," + location.getZ() + "]");
-    //            double c[] = {location.getX(), location.getY(), location.getZ()};
-    //            double lla[] = CoordinateConversions.xyzToLatLonDegrees(c);
-    //            System.out.println(" Location (lat/lon/alt): [" + lla[0] + ", " + lla[1] + ", " + lla[2] + "]");
                 clientConnection.close();
             }
             catch(Exception e)
@@ -252,7 +176,7 @@ public static void main(String args[])
     * also pick up a 192.168 address assigned to the VM by the host OS.
     * 
     * @return set of all bcast addresses
-    */
+    
    public static Set<InetAddress> getBroadcastAddresses()
    {
        Set<InetAddress> bcastAddresses = new HashSet<InetAddress>();
@@ -292,5 +216,5 @@ public static void main(String args[])
        
        return bcastAddresses;   
    }
-
+**/
 }
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ListenerTcp.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ListenerTcp.java
deleted file mode 100644
index 670c89af6da8c87064a5e22934fefa7b0ba8e292..0000000000000000000000000000000000000000
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ListenerTcp.java
+++ /dev/null
@@ -1,52 +0,0 @@
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-/**
- *
- * @author cs2017
- */
-public class ListenerTcp implements Runnable {
-    
-    private int port;
-    
-    public ListenerTcp(int port){
-        this.port = port;
-    }
-
-    public void run() {
-        System.out.println("TCP Listener Activated on port: " + port);
-        try {
-        ServerSocket serverSocket = new ServerSocket(port);
-        while(true){
-            Socket clientConnection = serverSocket.accept();
-            InputStream is = clientConnection.getInputStream();
-            InputStreamReader isr = new InputStreamReader(is);
-            BufferedReader br = new BufferedReader(isr);
-            
-            String serverMessage = br.readLine();
-            System.out.println("The message the client sent was " + serverMessage);
-                
-            clientConnection.close();  
-            }
-        }
-        catch(Exception e)
-        {
-            System.out.println(e);
-        }
-    }
-
-    public static void main(String args[]) {
-        (new Thread(new ListenerTcp())).start();
-    }
-
-}