diff --git a/backend/Main.py b/backend/Main.py
index 45f60d57c..7e8054a70 100644
--- a/backend/Main.py
+++ b/backend/Main.py
@@ -21,19 +21,23 @@ def run_server():
     tornado.ioloop.IOLoop.current().start()
     tornado.ioloop.IOLoop.instance().add_timeout(timedelta(seconds=1),
                                                  send_all_async)
+
+
 def run():
-    # NetworkTables.startClientTeam(team=self.settings_manager.general_settings.get("team_number", 1577))
-    NetworkTables.initialize("localhost")
+    NetworkTables.startClientTeam(team=settings_manager.general_settings.get("team_number", 1577))
+    # NetworkTables.initialize("localhost")
     port = 5550
     for cam_name in settings_manager.usb_cameras:
         CameraHandler(cam_name, port).run()
         port += 1
 
+
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)
     settings_manager = SettingsManager()
+    run()
     server_thread = threading.Thread(target=run_server)
     server_thread.start()
-    run()
+
     while True:
         pass
diff --git a/backend/app/handlers/CameraHander.py b/backend/app/handlers/CameraHander.py
index 00b0834ff..d3541685e 100644
--- a/backend/app/handlers/CameraHander.py
+++ b/backend/app/handlers/CameraHander.py
@@ -124,7 +124,7 @@ class CameraHandler:
             socket.send_pyobj(self.image)
             self.p_image = socket.recv_pyobj()
             self.nt_data = socket.recv_json()
-            # if self.settings_manager.general_settings['curr_camera'] == cam_name:
+            # if self.settings_manager.general_settings['curr_camera'] == self.cam_name:
             #     try:
             #         send_all_async({
             #             'raw_point': self.nt_data['raw_point'],