diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverBtoTCP.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverBtoTCP.java
index 60106c797ef50605ba3151fdce4f00be89f57221..4004eb38d27d97e17315aac10e3b73c9041b5a90 100644
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverBtoTCP.java
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/ABEspduReceiverBtoTCP.java
@@ -12,14 +12,12 @@ 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 ABEspduReceiverBtoTCP {
 
-    /** 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.144.187";
     public static final int DIS_DESTINATION_PORT = 2800;
     public static final int TCP_DESTINATION_PORT = 2998;
     public static final int MAX_PDU_SIZE = 8192;
@@ -30,85 +28,68 @@ public class ABEspduReceiverBtoTCP {
         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.");
+            //System.out.println("Joined Group.");
             // Loop infinitely, receiving datagrams
             while (true) {
-                try
-                {
-
+                try{
                 byte buffer[] = new byte[MAX_PDU_SIZE];
                 packet = new DatagramPacket(buffer, buffer.length);
-
                 socket.receive(packet);
-                System.out.println("Packet Received");
-
-
+                //System.out.println("Packet Received");
                 List<Pdu> pduBundle = pduFactory.getPdusFromBundle(packet.getData());
-                System.out.println("Bundle size is " + pduBundle.size());
-                
+                //System.out.println("Bundle size is " + pduBundle.size());
                 Iterator it = pduBundle.iterator();
 
-                while(it.hasNext())
-                {
+                while(it.hasNext()){
                     Pdu aPdu = (Pdu)it.next();
-                
                     //System.out.print("got PDU of type: " + aPdu.getClass().getName());
-                    if(aPdu instanceof EntityStatePdu)
-                    {
+                    if(aPdu instanceof EntityStatePdu){
                         EntityID eid = ((EntityStatePdu)aPdu).getEntityID();
                         if (eid.getSite() == 200){
                                                                 // 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() + "]");
+                            Socket clientConnection = new Socket(TCP_DESTINATION_IP, TCP_DESTINATION_PORT); 
+                            OutputStream os = clientConnection.getOutputStream();
+                            PrintStream ps = new PrintStream(os);
+
+                            System.out.println("Bravo briding 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() + ", " + position.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/AngelBlankEspduReceiverBtoTCP.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduReceiverBtoTCP.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c700b09436193b25bcf49c4da4b283a44c7a0e8
--- /dev/null
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduReceiverBtoTCP.java
@@ -0,0 +1,96 @@
+
+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 and creates a TCP connection, 
+ * then sends information through the connection.
+ *
+ * @author Angelopoulos/Blankenbeker
+ * @version 8 MAR 2018
+ */
+public class AngelBlankEspduReceiverBtoTCP {
+
+    public static final String TCP_DESTINATION_IP = "172.20.144.187";
+    public static final int DIS_DESTINATION_PORT = 2800;
+    public static final int TCP_DESTINATION_PORT = 2998;
+    public static final int MAX_PDU_SIZE = 8192;
+    public static final String GROUP = "239.1.2.3";
+    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() == 200){
+                                                                // 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("Bravo briding 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() + ", " + position.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/AngelBlankEspduSenderB.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduSenderB.java
index d251d568b90fc114510844975b0391a61147d198..b48aeb88df858fcde75ad55313a3cb80ad74ff63 100644
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduSenderB.java
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduSenderB.java
@@ -10,29 +10,18 @@ import edu.nps.moves.disutil.DisTime;
 /**
  * Creates and sends ESPDUs in IEEE binary format. 
  *
- * @author DMcG
+ * @author Angelopoulos/Blankenbeker
+ * 8 MAR 2018
  */
 public class AngelBlankEspduSenderB 
 {
     public static final int NUMBER_TO_SEND = 5000;
-
     public enum NetworkMode{UNICAST, MULTICAST, BROADCAST};
-
     /** default multicast group we send on */
     public static final String DEFAULT_MULTICAST_GROUP="239.1.2.3";
-   
     /** Port we send on */
     public static final int DIS_DESTINATION_PORT = 2800;
-    
-/** 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 */
@@ -44,14 +33,10 @@ public static void main(String args[])
     // 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;
-    
     try
     {
         destinationIp = InetAddress.getByName(DEFAULT_MULTICAST_GROUP);
@@ -117,26 +102,12 @@ public static void main(String args[])
         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(200);  // 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
@@ -145,130 +116,36 @@ public static void main(String args[])
     entityType.setSubcategory((short)1);     // M1 Abrams
     entityType.setSpec((short)3);            // M1A2 Abrams
     
-
-    //Set<InetAddress> bcastAddresses = getBroadcastAddresses();
-    // Loop through sending N ESPDUs
     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();
-            
+            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)
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverASenderB.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverASenderB.java
index f1423e13aa820187bb97768b12fe9184fb41888d..cfee4baaf40da0d0fe962482482738094972853a 100644
--- a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverASenderB.java
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverASenderB.java
@@ -7,22 +7,20 @@ import edu.nps.moves.dis.*;
 import edu.nps.moves.disutil.DisTime;
 
 /**
- * Creates and sends ESPDUs in IEEE binary format. 
+ * Listens for TCP connection from AngelBlankReciverBToTCP and sends ESPDU. 
  *
- * @author DMcG
+ * @author Angelopoulos/Blankenbeker
+ * 8 MAR 2018
  */
 public class AngelBlankEspduTCPReceiverASenderB
 {
     public static final int NUMBER_TO_SEND = 5000;
-
     public enum NetworkMode{UNICAST, MULTICAST, BROADCAST};
-
     /** default multicast group we send on */
     public static final String DEFAULT_MULTICAST_GROUP="239.1.2.3";
     public static final int TCP_DESTINATION_PORT = 2999;
     /** Port we send on */
     public static final int DIS_DESTINATION_PORT = 2800;
-    
 /** 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.
@@ -39,18 +37,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;
-    
     try
     {
         destinationIp = InetAddress.getByName(DEFAULT_MULTICAST_GROUP);
@@ -60,21 +49,10 @@ public static void main(String args[])
         System.out.println(e + " Cannot create multicast address");
         System.exit(0);
     }
-    
-    // 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
     {
  
@@ -119,18 +97,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("RA SB 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("RA SB waiting to readline.");
                 int entitySite = Integer.parseInt(br.readLine());
                 int entityApplication = Integer.parseInt(br.readLine());
                 int entityEntity = Integer.parseInt(br.readLine());
@@ -140,92 +120,30 @@ 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("RA SB 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
                 entityType.setDomain(entityDomain);          // AIR (vs air, surface, subsurface, space)
                 entityType.setCategory(entityCategory);        // Tank
                 entityType.setSubcategory(entitySubcategory);     // M1 Abrams
-                entityType.setSpec(entitySpec);            // M1A2 Abrams
-
-
-                Set<InetAddress> bcastAddresses = getBroadcastAddresses();
-                // Loop through sending N ESPDUs
-                
-                
-                
+                entityType.setSpec(entitySpec);            // M1A2 Abrams              
                 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)
@@ -241,18 +159,7 @@ public static void main(String args[])
         
 }
 
- /**
-    * A number of sites get all snippy about using 255.255.255.255 for a bcast
-    * address; it trips their security software and they kick you off their 
-    * network. (Comcast, NPS.) This determines the bcast address for all
-    * connected interfaces, based on the IP and subnet mask. If you have
-    * a dual-homed host it will return a bcast address for both. If you have
-    * some VMs running on your host this will pick up the addresses for those
-    * as well--eg running VMWare on your laptop with a local IP this will
-    * 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>();
diff --git a/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverASenderBTest.java b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverASenderBTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..47073ffd471d83dddc96ca7d9d3e592ce1d1ebf2
--- /dev/null
+++ b/projects/Assignments/FinalProjects/2018March/AngelopoulosBlankenbeker/AngelBlankEspduTCPReceiverASenderBTest.java
@@ -0,0 +1,228 @@
+
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import edu.nps.moves.dis.*;
+import edu.nps.moves.disutil.*;
+import edu.nps.moves.disutil.CoordinateConversions;
+import edu.nps.moves.disutil.DisTime;
+
+/**
+ * Listens for TCP connection from AngelBlankReciverBToTCP and sends ESPDU. 
+ *
+ * @author Angelopoulos/Blankenbeker
+ * 8 MAR 2018
+ */
+public class AngelBlankEspduTCPReceiverASenderBTest
+{
+    public static final int NUMBER_TO_SEND = 5000;
+    public enum NetworkMode{UNICAST, MULTICAST, BROADCAST};
+    /** default multicast group we send on */
+    public static final String DEFAULT_MULTICAST_GROUP="239.1.2.3";
+    public static final int MAX_PDU_SIZE = 8192;
+    public static final int TCP_DESTINATION_PORT = 2999;
+    /** Port we send on */
+    public static final int DIS_DESTINATION_PORT = 2800;
+/** 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 */
+    EntityStatePdu espdu = new EntityStatePdu();
+    MulticastSocket socket = null;
+    DisTime disTime = DisTime.getInstance();
+    int alternator = -1;
+    int port = DIS_DESTINATION_PORT;
+    NetworkMode mode = NetworkMode.MULTICAST;
+    InetAddress destinationIp = null;
+    PduFactory pduFactory = new PduFactory();
+    try
+    {
+        destinationIp = InetAddress.getByName(DEFAULT_MULTICAST_GROUP);
+    }
+    catch(Exception e)
+    {
+        System.out.println(e + " Cannot create multicast address");
+        System.exit(0);
+    }
+    Properties systemProperties = System.getProperties();
+    String destinationIpString = systemProperties.getProperty("destinationIp");
+    String portString = systemProperties.getProperty("port");
+    String networkModeString = systemProperties.getProperty("networkMode"); // unicast or multicast or broadcast
+    try
+    {
+ 
+        // Port we send to
+        if(portString != null)
+            port = Integer.parseInt(portString);
+        
+        socket = new MulticastSocket(DIS_DESTINATION_PORT);
+        
+        // Where we send packets to, the destination IP address
+        if(destinationIpString != null)
+        {
+            destinationIp = InetAddress.getByName(destinationIpString);
+        }
+
+        // Type of transport: unicast, broadcast, or multicast
+        if(networkModeString != null)
+        {
+            if(networkModeString.equalsIgnoreCase("unicast"))
+                mode = NetworkMode.UNICAST;
+            else if(networkModeString.equalsIgnoreCase("broadcast"))
+                mode = NetworkMode.BROADCAST;
+            else if(networkModeString.equalsIgnoreCase("multicast"))
+            {
+                mode = NetworkMode.MULTICAST;
+                if(!destinationIp.isMulticastAddress())
+                {
+                    throw new RuntimeException("Sending to multicast address, but destination address " + destinationIp.toString() + "is not multicast");
+                }
+                
+                socket.joinGroup(destinationIp);
+                
+            }
+        } // end networkModeString
+    }
+    catch(Exception e)
+    {
+        System.out.println("Unable to initialize networking. Exiting.");
+        System.out.println(e);
+        System.exit(-1);
+    }
+
+    try
+    {
+        int connectionCount = 0;
+        DatagramSocket ds = new DatagramSocket(TCP_DESTINATION_PORT);
+        //ServerSocket serverSocket = new ServerSocket(TCP_DESTINATION_PORT);
+
+        while(true){
+            try
+            {
+                byte buffer[] = new byte[MAX_PDU_SIZE];
+                DatagramPacket tcpPacket = new DatagramPacket(buffer, buffer.length);
+                ds.receive(tcpPacket);
+                //Socket clientConnection = serverSocket.accept();
+                connectionCount++;
+                System.out.println("Current PDUs transferred over TCP: "+ connectionCount);
+                List<Pdu> pduBundle = pduFactory.getPdusFromBundle(tcpPacket.getData());
+                //System.out.println("Bundle size is " + pduBundle.size());
+                Iterator it = pduBundle.iterator();
+
+                while(it.hasNext()){
+                    //System.out.println("Entity ID transferred: ");
+                    Pdu aPdu = (Pdu)it.next();
+                    //System.out.print("got PDU of type: " + aPdu.getClass().getName());
+                    if(aPdu instanceof EntityStatePdu){
+                        EntityID eid = ((EntityStatePdu)aPdu).getEntityID();
+                        System.out.println("Entity ID transferred: "+eid.getEntity());
+                        
+                        //System.out.println();
+                     // end trop through PDU bundle
+                //System.out.println("RA SB 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.");
+                int entitySite = Integer.parseInt(br.readLine());
+                int entityApplication = Integer.parseInt(br.readLine());
+                int entityEntity = Integer.parseInt(br.readLine());
+                short entityEntityKind = Short.parseShort(br.readLine());
+                int entityCountry = Integer.parseInt(br.readLine());
+                short entityDomain = Short.parseShort(br.readLine());
+                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.");               
+                espdu.setExerciseID((short)1);
+                EntityID eid = espdu.getEntityID();
+                eid.setSite(entitySite);  // 0 is apparently not a valid site number, per the spec
+                eid.setApplication(entityApplication); 
+                eid.setEntity(entityEntity);
+                EntityType entityType = espdu.getEntityType();
+                entityType.setEntityKind(entityEntityKind);      // Platform (vs lifeform, munition, sensor, etc.)
+                entityType.setCountry(entityCountry);              // USA
+                entityType.setDomain(entityDomain);          // AIR (vs air, surface, subsurface, space)
+                entityType.setCategory(entityCategory);        // Tank
+                entityType.setSubcategory(entitySubcategory);     // M1 Abrams
+                entityType.setSpec(entitySpec);            // M1A2 Abrams  **/            
+                //int ts = disTime.getDisAbsoluteTimestamp();
+                //espdu.setTimestamp(ts);
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                DataOutputStream dos = new DataOutputStream(baos);
+                aPdu.marshal(dos);
+                // The byte array here is the packet in DIS format. We put that into a 
+                // datagram and send it.
+                byte[] data = baos.toByteArray();
+                DatagramPacket udpPacket = new DatagramPacket(data, data.length, InetAddress.getByName(DEFAULT_MULTICAST_GROUP), DIS_DESTINATION_PORT);
+                socket.send(udpPacket); 
+                    }
+                //System.out.println(" EID=[" + eid.getSite() + "," + eid.getApplication() + "," + eid.getEntity() + "]");
+                //clientConnection.close();
+            }
+            }
+            catch(Exception e)
+            {
+                System.out.println(e);
+            }
+        }
+    }
+    catch(Exception e)
+    {
+        System.out.println(e);
+    }
+        
+}
+
+
+   public static Set<InetAddress> getBroadcastAddresses()
+   {
+       Set<InetAddress> bcastAddresses = new HashSet<InetAddress>();
+       Enumeration interfaces;
+       
+       try
+       {
+           interfaces = NetworkInterface.getNetworkInterfaces();
+           
+           while(interfaces.hasMoreElements())
+           {
+               NetworkInterface anInterface = (NetworkInterface)interfaces.nextElement();
+               
+               if(anInterface.isUp())
+               {
+                   Iterator it = anInterface.getInterfaceAddresses().iterator();
+                   while(it.hasNext())
+                   {
+                       InterfaceAddress anAddress = (InterfaceAddress)it.next();
+                       if((anAddress == null || anAddress.getAddress().isLinkLocalAddress()))
+                           continue;
+                       
+                       //System.out.println("Getting bcast address for " + anAddress);
+                       InetAddress abcast = anAddress.getBroadcast();
+                       if(abcast != null)
+                        bcastAddresses.add(abcast);
+                   }
+               }
+           }
+           
+       }
+       catch(Exception e)
+       {
+           e.printStackTrace();
+           System.out.println(e);
+       }
+       
+       return bcastAddresses;   
+   }
+
+}