diff --git a/cs656/lab3/ChatClient.java b/cs656/lab3/ChatClient.java
index ee36d47..dc1b97d 100644
--- a/cs656/lab3/ChatClient.java
+++ b/cs656/lab3/ChatClient.java
@@ -20,5 +20,35 @@ public class ChatClient
 
     public static void main(String[] args)
     {
+        boolean master = false;
+        String user = "user";
+        String host = "localhost";
+        int argIndex = 0;
+
+        for (String s : args)
+        {
+            if (s.equals("-master"))
+                master = true;
+            else
+            {
+                switch (argIndex)
+                {
+                    case 0:
+                        user = s;
+                        break;
+                    case 1:
+                        host = s;
+                        break;
+                    default:
+                        usage();
+                }
+            }
+        }
+    }
+
+    private static void usage()
+    {
+        System.err.println("Usage: java ChatClient [-master] {user} {host}");
+        System.exit(42);
     }
 }