diff --git a/Main/src/main/java/com/chameleonvision/Main.java b/Main/src/main/java/com/chameleonvision/Main.java
index 36e91cb36..e01a5eb72 100644
--- a/Main/src/main/java/com/chameleonvision/Main.java
+++ b/Main/src/main/java/com/chameleonvision/Main.java
@@ -1,6 +1,7 @@
 package com.chameleonvision;
 
 import com.chameleonvision.settings.SettingsManager;
+import com.chameleonvision.util.Utilities;
 import com.chameleonvision.vision.camera.CameraManager;
 import com.chameleonvision.vision.process.VisionProcess;
 import com.chameleonvision.web.Server;
@@ -11,40 +12,98 @@ import edu.wpi.first.networktables.NetworkTableInstance;
 import java.io.IOException;
 
 public class Main {
-	private static final String PORT_KEY = "-port";
-	public static void main(String[] args) {
-		int port = 8888;
-		for(int i=0; i<args.length; i+=2)
-		{
-			String key = args[i];
-			String value = args[i+1];
-			if (PORT_KEY.equals(key)) {
-				try{
-					port = Integer.parseInt(value);
-				}
-				catch (NumberFormatException e){
-					System.err.println("Given Port Was Not A Number Starting Server At Default Port");
-				}
-			}
-		}
-		// Attempt to load the JNI Libraries
-		try {
-			CameraServerJNI.forceLoad();
-			CameraServerCvJNI.forceLoad();
-		} catch (IOException e) {
-			var errorStr = SettingsManager.getCurrentPlatform().equals(SettingsManager.Platform.UNSUPPORTED) ? "Unsupported platform!" : "Failed to load JNI Libraries!";
-			throw new RuntimeException(errorStr);
-		}
 
-		if (CameraManager.initializeCameras()) {
-			SettingsManager.initialize();
-			CameraManager.initializeThreads();
-			NetworkTableInstance.getDefault().startClientTeam(SettingsManager.GeneralSettings.team_number);
-//			NetworkTableInstance.getDefault().startClient("localhost");
-			System.out.println("Starting WebServer At Port:" + port);
-			Server.main(port);
-		} else {
-			System.err.println("No cameras connected!");
-		}
-	}
+    private static final String PORT_KEY = "--port"; // expects integer
+    private static final String NT_SERVERMODE_KEY = "--ntservermode"; // no args for this setting
+    private static final String NT_CLIENTMODESERVER_KEY = "--ntclientserver"; // expects String representing an IP address (hostnames will be rejected!)
+
+    private static final int DEFAULT_PORT = 8888;
+
+    private static int webserverPort = DEFAULT_PORT;
+    private static boolean ntServerMode = false;
+    private static String ntClientModeServer = null;
+
+    private static void handleArgs(String[] args) {
+        for (int i = 0; i < args.length; i++) {
+            var key = args[i].toLowerCase();
+            String value = null;
+
+            // this switch handles arguments with a value. Add any settings with a value here.
+            switch (key) {
+                case PORT_KEY:
+                case NT_CLIENTMODESERVER_KEY:
+                    var potentialValue = args[i + 1];
+                    // ensures this "value" isnt null, blank, nor another argument
+                    if (potentialValue != null && !potentialValue.isBlank() && !potentialValue.startsWith("-") & !potentialValue.startsWith("--")) {
+                        value = potentialValue.toLowerCase();
+                    }
+                    i++; // increment to skip an 'arg' next go-around of for loop, as that would be this value
+                    break;
+                case NT_SERVERMODE_KEY:
+                    // nothing
+            }
+
+            // this switch actually handles the arguments.
+            switch (key) {
+                case PORT_KEY:
+                    try {
+                        if (value == null) throw new Exception("Bad or No argument value");
+                        webserverPort = Integer.parseInt(value);
+                    } catch (Exception ex) {
+                        System.err.printf("Argument for port was invalid, starting server at port %d\n", DEFAULT_PORT);
+                    }
+                    break;
+                case NT_SERVERMODE_KEY:
+                    ntServerMode = true;
+                    break;
+                case NT_CLIENTMODESERVER_KEY:
+                    if (value != null) {
+                        if (value.equals("localhost")) {
+                            ntClientModeServer = "127.0.0.1";
+                            return;
+                        }
+
+                        if (Utilities.isValidIPV4(value)) {
+                            ntClientModeServer = value;
+                            return;
+                        }
+                    }
+                    System.err.println("Argument for NT Server Host was invalid, defaulting to team number host");
+                    break;
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        handleArgs(args);
+        // Attempt to load the JNI Libraries
+        try {
+            CameraServerJNI.forceLoad();
+            CameraServerCvJNI.forceLoad();
+        } catch (IOException e) {
+            var errorStr = SettingsManager.getCurrentPlatform().equals(SettingsManager.Platform.UNSUPPORTED) ? "Unsupported platform!" : "Failed to load JNI Libraries!";
+            throw new RuntimeException(errorStr);
+        }
+
+        if (CameraManager.initializeCameras()) {
+            SettingsManager.initialize();
+            CameraManager.initializeThreads();
+
+            if (ntServerMode) {
+                System.out.println("Starting NT Server");
+                NetworkTableInstance.getDefault().startServer();
+            } else {
+                if (ntClientModeServer != null) {
+                    NetworkTableInstance.getDefault().startClient(ntClientModeServer);
+                } else {
+                    NetworkTableInstance.getDefault().startClientTeam(SettingsManager.GeneralSettings.team_number);
+                }
+            }
+
+            System.out.printf("Starting Webserver at port %d\n", webserverPort);
+            Server.main(webserverPort);
+        } else {
+            System.err.println("No cameras connected!");
+        }
+    }
 }
diff --git a/Main/src/main/java/com/chameleonvision/util/Utilities.java b/Main/src/main/java/com/chameleonvision/util/Utilities.java
new file mode 100644
index 000000000..358559643
--- /dev/null
+++ b/Main/src/main/java/com/chameleonvision/util/Utilities.java
@@ -0,0 +1,11 @@
+package com.chameleonvision.util;
+
+public class Utilities {
+    private Utilities() {}
+
+    public static boolean isValidIPV4(final String ip) {
+        String PATTERN = "^((0|1\\d?\\d?|2[0-4]?\\d?|25[0-5]?|[3-9]\\d?)\\.){3}(0|1\\d?\\d?|2[0-4]?\\d?|25[0-5]?|[3-9]\\d?)$";
+
+        return ip.matches(PATTERN);
+    }
+}