diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework2/Garibay/GaribayClient.java b/assignments/src/MV3500Cohort2020JulySeptember/homework2/Garibay/GaribayClient.java
index b37f97efdc66d9dd09a1aaef5df6eaad842f7b6a..2c2c7e1ccae7dbf8054605e45821de768145ca74 100644
--- a/assignments/src/MV3500Cohort2020JulySeptember/homework2/Garibay/GaribayClient.java
+++ b/assignments/src/MV3500Cohort2020JulySeptember/homework2/Garibay/GaribayClient.java
@@ -1,36 +1,33 @@
 package MV3500Cohort2020JulySeptember.homework2.Garibay;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-
+import java.io.*;
+import java.net.*;
 /**
  *
- * @author chris
+ * @author Chris
  */
 public class GaribayClient {
+
     // IPv6 String constant for localhost address, similarly IPv4 127.0.0.1
     public final static String LOCALHOST = "0:0:0:0:0:0:0:1";
 
     public static void main(String[] args) {
-
+        
         // Local vars/fields
         Socket socket;
         InputStream is;
         InputStreamReader isr;
         BufferedReader br;
         String serverMessage;
-
+        Integer count = 0;
+        
+        OutputStream os;
+        PrintStream ps;
+        
+        
         try {
             while (true) {
-
-                //Added a joke to begin with 
-                System.out.println("Where do teeth like to shop?");
+                System.out.println("TcpExample3Client creating socket...");
 
                 // We request an IP to connect to ("localhost") and
                 // port number at that IP (2317). This establishes
@@ -43,38 +40,40 @@ public class GaribayClient {
                 is = socket.getInputStream();
                 isr = new InputStreamReader(is);
                 br = new BufferedReader(isr);
+                
 
                 // Read a single line written by the server. We'd
                 // do things a bit differently if there were many lines to be read
                 // from the server instead of one only.
                 serverMessage = br.readLine();
                 System.out.println("==================================================");
-                //changed the connecting lingo
-
-                System.out.println("The message the server sent was: '" + serverMessage + "'");
-                
-                //If the server predicts the correct answer, the client will
-                //say he is correct and break from the loop. Ultimately ending
-                //the connection.
-                if (serverMessage.contentEquals("The Gap")) {
-                    System.out.println("Correct!");
-                    break;
-                } else {
-                    System.out.println("Nope! Try again.");
-                }
-
+                System.out.println("'How many beer bottles are on the wall?");
+                System.out.println("The GaribayServer responds by saying: '" + serverMessage + "'");
+                System.out.println("GaribayClient says, 'There are "+ count +" beer bottles on the wall. Always good to have more beer bottles.");
+                count++;
                 // socket gets closed, either automatically/silently by this code (or possibly by the server)
+                
+                
+                // Now hook everything up (i.e. set up the streams), Java style:
+                os = socket.getOutputStream();
+                ps = new PrintStream(os);
+                ps.println("GaribayClient message."); // this gets sent back to client!
+                
+                ps.flush();
+                
+                
+                
             } // end while(true)
         } catch (IOException e) {
             System.err.println("Problem with TcpExample3ServerClient networking:"); // describe what is happening
             System.err.println("Error: " + e);
-
+            
             // Provide more helpful information to user if exception occurs due to running twice at one time
             if (e instanceof java.net.BindException) {
                 System.err.println("*** Be sure to stop any other running instances of programs using this port!");
             }
         } finally {
-
+        
             // program exit: tell somebody about that
             System.out.println("\nclient exit");
         }
diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework2/Garibay/GaribayServer.java b/assignments/src/MV3500Cohort2020JulySeptember/homework2/Garibay/GaribayServer.java
index 6fcca6926b47c6576af89c4ae7d307002c8d6123..a9070a878b8df8900e9f2e6b53c64f8f70f43748 100644
--- a/assignments/src/MV3500Cohort2020JulySeptember/homework2/Garibay/GaribayServer.java
+++ b/assignments/src/MV3500Cohort2020JulySeptember/homework2/Garibay/GaribayServer.java
@@ -1,103 +1,94 @@
 package MV3500Cohort2020JulySeptember.homework2.Garibay;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
+import java.io.*;
+import java.net.*;
 
 /**
  *
- * @author chris
+ * @author Chris
  */
 public class GaribayServer {
+
     public static void main(String[] args) {
         try {
-
+            
             // ServerSocket waits for a connection from a client. 
             // Notice that it is outside the loop; ServerSocket
             // needs to be made only once.
+            System.out.println("TcpExample3Server has started..."); // it helps debugging to put this on console first
             
-
             ServerSocket serverSocket = new ServerSocket(2317);
             OutputStream os;
             PrintStream ps;
             InetAddress localAddress, remoteAddress;
+            
+            InputStream is;
+            InputStreamReader isr;
+            BufferedReader br;
+            String clientMessage;
             int localPort, remotePort;
 
             // Server is up and waiting (i.e. "blocked" or paused)
             // Loop, infinitely, waiting for client connections.
             // Stop the program somewhere else.
-            //initialize the messageToClient
-            String messageToClient = "Thomas' house";
-            
-            //Want the server to provide several answers to the question
-            //To keep the while loop, I just initialized a variable as a global
-            //to change as the code executes. 
-            int i = 0;
-            
-        //Added a length for the while loop dependent on the value of i. 
-        while (i<4) {
-
-            // block until connected to a client
-            try (Socket clientConnection = serverSocket.accept()) {
-
-                // Now hook everything up (i.e. set up the streams), Java style:
-                os = clientConnection.getOutputStream();
-                ps = new PrintStream(os);
-                //changed what the server says to the client in response
-                ps.println(messageToClient);
-
-                // Print some information locally about the Socket connection.
-                // This includes the port and IP numbers on both sides (the socket pair).
-                localAddress = clientConnection.getLocalAddress();
-                remoteAddress = clientConnection.getInetAddress();
-                localPort = clientConnection.getLocalPort();
-                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("TcpExample3Server socket pair: (( " + localAddress.toString() + ", " + localPort + " ), ( "
-                        + remoteAddress.toString() + ", " + remotePort + " ))");
+            while (true) { 
+                
+                // block until connected to a client
+                try (Socket clientConnection = serverSocket.accept()) {
+                    
+                    // Now hook everything up (i.e. set up the streams), Java style:
+                    os = clientConnection.getOutputStream();
+                    ps = new PrintStream(os);
+                    ps.println("Count for yourself!"); // this gets sent back to client!
+                    
+                    // Print some information locally about the Socket connection.
+                    // This includes the port and IP numbers on both sides (the socket pair).
+                    localAddress = clientConnection.getLocalAddress();
+                    remoteAddress = clientConnection.getInetAddress();
+                    localPort = clientConnection.getLocalPort();
+                    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("TcpExample3Server socket pair: (( " + localAddress.toString() + ", " + localPort + " ), ( "
+                            + remoteAddress.toString() + ", " + remotePort + " ))");
+                    
+                    // Notice the use of flush() and try w/ resources. Without
+                    // the try w/ resources the Socket object may stay open for
+                    // a while after the client has stopped needing this
+                    // connection. try w/ resources explicitly ends the connection.
+                    
+                                    // Now hook everything up (i.e. set up the streams), Java style:
+                is = clientConnection.getInputStream();
+                isr = new InputStreamReader(is);
+                br = new BufferedReader(isr);
                 
-                //Provides different answers to the client
-                if (i == 0) {
-                    messageToClient = "American Eagle";
-                }
-                if (i == 1) {
-                    messageToClient = "At Urban Outfitters";
-                }
-                if (i == 2) {
-                    messageToClient = "The Gap";
-                }
-                //Iterates i to change the answers provided.
-                i += 1;
 
-                // Notice the use of flush() and try w/ resources. Without
-                // the try w/ resources the Socket object may stay open for
-                // a while after the client has stopped needing this
-                // connection. try w/ resources explicitly ends the connection.
-                ps.flush();
-                // like it or not, you're outta here!
+                // Read a single line written by the server. We'd
+                // do things a bit differently if there were many lines to be read
+                // from the server instead of one only.
+                clientMessage = br.readLine();
+                System.out.println("==================================================");
+                System.out.println("Now we're talking!");
+                System.out.println("The message the server sent was: '" + clientMessage + "'");
+//                System.out.println("This was the "+ count +" connection.");
+                    
+                    
+                    
+                    ps.flush();
+                    // like it or not, you're outta here!
+                }
             }
-        }
-    }
-    catch (IOException e
-
-    
-        ) {
+        } catch (IOException e) {
             System.err.println("Problem with TcpExample3Server networking: " + e);
 
-        // Provide more helpful information to user if exception occurs due to running twice at one time
-        if (e instanceof java.net.BindException) {
-            System.err.println("*** Be sure to stop any other running instances of programs using this port!");
+            // Provide more helpful information to user if exception occurs due to running twice at one time
+            if (e instanceof java.net.BindException) {
+                System.err.println("*** Be sure to stop any other running instances of programs using this port!");
+            }
         }
     }
 }
-}