From 4ccc50170080fedf9cfd9e824893fd9de080ec2f Mon Sep 17 00:00:00 2001
From: Joshua Higgins <joshuafhiggins@gmail.com>
Date: Tue, 3 Feb 2026 13:39:16 -0500
Subject: [PATCH] feat: all new networking changes (except reservations), huge
 refactor and fmt

---
 .editorconfig              |    6 +
 scripts/AddressUI.cs       |   12 +-
 scripts/AdminControls.cs   |   14 +-
 scripts/BackButton.cs      |   27 +-
 scripts/BoardScreen.cs     |  443 ++++++++--------
 scripts/BracketScene.cs    |  188 +++----
 scripts/ConnectButtonUI.cs |   90 ++--
 scripts/Connection.cs      | 1026 ++++++++++++++++++------------------
 scripts/MatchData.cs       |   22 +-
 scripts/PlayerData.cs      |   20 +-
 scripts/TournamentType.cs  |    5 +
 11 files changed, 895 insertions(+), 958 deletions(-)
 create mode 100644 scripts/TournamentType.cs

diff --git a/.editorconfig b/.editorconfig
index f28239b..7c9423d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,3 +2,9 @@ root = true
 
 [*]
 charset = utf-8
+indent_style = space
+indent_size = 2
+tab_width = 2
+
+[*.{cs,vb}]
+dotnet_diagnostic.CA1050.severity = none
diff --git a/scripts/AddressUI.cs b/scripts/AddressUI.cs
index 8a88187..b4775b6 100644
--- a/scripts/AddressUI.cs
+++ b/scripts/AddressUI.cs
@@ -1,10 +1,8 @@
 using Godot;
 using System;
 
-public partial class AddressUI : TextEdit
-{
-	public override void _Ready()
-	{
-		Text = Connection.WS_DEFAULT_ADDRESS;
-	}
-}
+public partial class AddressUI : TextEdit {
+  public override void _Ready() {
+    Text = Connection.WS_DEFAULT_ADDRESS;
+  }
+}
\ No newline at end of file
diff --git a/scripts/AdminControls.cs b/scripts/AdminControls.cs
index a113e31..a1358f2 100644
--- a/scripts/AdminControls.cs
+++ b/scripts/AdminControls.cs
@@ -12,9 +12,10 @@ public partial class AdminControls : HBoxContainer
 	{
 		Connection.Instance.OnBecomeAdmin += UpdateUI;
 		Connection.Instance.OnTournamentEnd += UpdateUI;
-		Connection.Instance.OnStartTournamentAck += UpdateUI;
+		Connection.Instance.OnStartTournament += UpdateUI;
 		Connection.Instance.OnCancelTournamentAck += UpdateUI;
 		Connection.Instance.OnGetDataAcks += UpdateUI;
+		Connection.Instance.OnSetDataAcks += UpdateUI;
 		
 		StartTournament.Pressed += () => Connection.Instance.StartTournament();
 		CancelTournament.Pressed += () => Connection.Instance.CancelTournament();
@@ -23,7 +24,7 @@ public partial class AdminControls : HBoxContainer
 		
 		Timeout.ValueChanged += value =>
 		{
-			Connection.Instance.SetTournamentWait((float)value);
+			Connection.Instance.SetMoveWait((float)value);
 			var time = Connection.Instance.CurrentWaitTimeout.ToString();
 			if (time.Length > 3)
 			{
@@ -32,16 +33,17 @@ public partial class AdminControls : HBoxContainer
 			Label.Text = "Wait To Move: " + time + "s ";
 		};
 		
-		BecomeAdmin.Pressed += ShowAuthPopup;
+		BecomeAdmin.Pressed += showAuthPopup;
 	}
 	
 	public override void _ExitTree()
 	{
 		Connection.Instance.OnBecomeAdmin -= UpdateUI;
 		Connection.Instance.OnTournamentEnd -= UpdateUI;
-		Connection.Instance.OnStartTournamentAck -= UpdateUI;
+		Connection.Instance.OnStartTournament -= UpdateUI;
 		Connection.Instance.OnCancelTournamentAck -= UpdateUI;
 		Connection.Instance.OnGetDataAcks -= UpdateUI;
+		Connection.Instance.OnSetDataAcks -= UpdateUI;
 	}
 
 	private void UpdateUI()
@@ -66,7 +68,7 @@ public partial class AdminControls : HBoxContainer
 			StartTournament.Hide();
 			CancelTournament.Hide();
 		}
-		else if (Connection.Instance.IsAdmin && Connection.Instance.ActiveTournament)
+		else if (Connection.Instance.IsAdmin && Connection.Instance.ActiveTournament != TournamentType.None)
 		{
 			StartTournament.Hide();
 			CancelTournament.Show();
@@ -87,7 +89,7 @@ public partial class AdminControls : HBoxContainer
 		Label.Text = "Wait To Move: " + time + "s ";
 	}
 
-	private void ShowAuthPopup()
+	private void showAuthPopup()
 	{
 		var authWindow = new Window();
 		authWindow.Theme = GD.Load<Theme>("res://assets/theme.tres");
diff --git a/scripts/BackButton.cs b/scripts/BackButton.cs
index 9b2a958..0e88d01 100644
--- a/scripts/BackButton.cs
+++ b/scripts/BackButton.cs
@@ -1,18 +1,15 @@
 using Godot;
 using System;
 
-public partial class BackButton : TextureButton
-{
-	private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn";
-	
-	public override void _Pressed()
-	{
-		TransitionToBracket();
-		base._Pressed();
-	}
-	
-	private void TransitionToBracket()
-	{
-		GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
-	}
-}
+public partial class BackButton : TextureButton {
+  private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn";
+
+  public override void _Pressed() {
+    TransitionToBracket();
+    base._Pressed();
+  }
+
+  private void TransitionToBracket() {
+    GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
+  }
+}
\ No newline at end of file
diff --git a/scripts/BoardScreen.cs b/scripts/BoardScreen.cs
index 271fa60..cae6ac5 100644
--- a/scripts/BoardScreen.cs
+++ b/scripts/BoardScreen.cs
@@ -1,264 +1,249 @@
 using Godot;
 using System.Linq;
 
-public partial class BoardScreen : Node2D
-{
-	[Export] private AudioStream endingSfx;
-	[Export] private Theme theme;
-	
-	private const string RED_CHIP_PATH = "res://scenes/red_chip.tscn";
-	private const string YELLOW_CHIP_PATH = "res://scenes/yellow_chip.tscn";
-	private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn";
-	private const int CHIP_SCALE = 3;
-	private const int CHIP_SIZE = 24;
-	private const int CHIP_PADDING = 2;
-	private const int CHIP_X_OFF = -(CHIP_SIZE + CHIP_PADDING) * 7 / 2 + (CHIP_SIZE + CHIP_PADDING) / 2;
-	private const int Y_OFF = 300;
-	private const int CARD_CENTER_X_DEFAULT = -536;
-	private const double MOVE_TIMEOUT_BEFORE_PLACE = 1.0f;
+public partial class BoardScreen : Node2D {
+  [Export] private AudioStream endingSfx;
+  [Export] private Theme theme;
 
-	private double currentTimeout = 0.0f;
+  private const string RED_CHIP_PATH = "res://scenes/red_chip.tscn";
+  private const string YELLOW_CHIP_PATH = "res://scenes/yellow_chip.tscn";
+  private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn";
+  private const int CHIP_SCALE = 3;
+  private const int CHIP_SIZE = 24;
+  private const int CHIP_PADDING = 2;
+  private const int CHIP_X_OFF = -(CHIP_SIZE + CHIP_PADDING) * 7 / 2 + (CHIP_SIZE + CHIP_PADDING) / 2;
+  private const int Y_OFF = 300;
+  private const int CARD_CENTER_X_DEFAULT = -536;
+  private const double MOVE_TIMEOUT_BEFORE_PLACE = 1.0f;
 
-	private PackedScene redChip;
-	private PackedScene ylwChip;
+  private double currentTimeout = 0.0f;
 
-	private Node2D player1Card; 
-	private Node2D player2Card;
-	private MatchData matchData;
-	
-	private RigidBody2D[,] chips = new RigidBody2D[6, 7]; // 6 rows 7 cols | 0, 0 is top left
+  private PackedScene redChip;
+  private PackedScene ylwChip;
 
-	private bool _lastMove = false;
-	private float _lastMoveTimer = 2.5f;
-	private string _winner = "";
+  private Node2D player1Card;
+  private Node2D player2Card;
+  private MatchData matchData;
 
-	// Called when the node enters the scene tree for the first time.
-	public override void _Ready() {
-		// Node initialization
-		player1Card = GetNode<Node2D>("Player1Card");
-		player2Card = GetNode<Node2D>("Player2Card");
+  private RigidBody2D[,] chips = new RigidBody2D[6, 7]; // 6 rows 7 cols | 0, 0 is top left
 
-		player1Card.GetNode<Label>("Name").Resized += () => setPlayerCardScale((player1Card.GetNode<Label>("Name").GetRect().Size.X + 7) / 16, player1Card);
-		player2Card.GetNode<Label>("Name").Resized += () => setPlayerCardScale((player2Card.GetNode<Label>("Name").GetRect().Size.X + 7) / 16, player2Card);
+  private bool _lastMove = false;
+  private float _lastMoveTimer = 2.5f;
+  private string _winner = "";
 
-		redChip = GD.Load<PackedScene>(RED_CHIP_PATH);
-		ylwChip = GD.Load<PackedScene>(YELLOW_CHIP_PATH);
-		
-		matchData = Connection.Instance.CurrentObservingMatch;
-		player1Card.GetNode<Label>("Name").Text = matchData.player1;
-		player2Card.GetNode<Label>("Name").Text = matchData.player2;
+  // Called when the node enters the scene tree for the first time.
+  public override void _Ready() {
+    // Node initialization
+    player1Card = GetNode<Node2D>("Player1Card");
+    player2Card = GetNode<Node2D>("Player2Card");
 
-		if (Connection.Instance.PreviousMoves.Count == 0)
-		{
-			player1Card.GetNode<Label>("Status").Show();
-			player2Card.GetNode<Label>("Status").Hide();
-		}
-		else if (Connection.Instance.PreviousMoves.Last().Item1 == matchData.player1)
-		{
-			player1Card.GetNode<Label>("Status").Hide();
-			player2Card.GetNode<Label>("Status").Show();
-		}
-		else
-		{
-			player1Card.GetNode<Label>("Status").Show();
-			player2Card.GetNode<Label>("Status").Hide();
-		}
-		
-		Connection.Instance.OnObserveWin += OnObserveWin;
-		Connection.Instance.OnObserveDraw += OnObserveDraw;
-		Connection.Instance.OnObserveTerminated += OnObserveTerminated;
-		Connection.Instance.OnObserveMove += ObserveMove;
-	}
+    player1Card.GetNode<Label>("Name").Resized += () =>
+      setPlayerCardScale((player1Card.GetNode<Label>("Name").GetRect().Size.X + 7) / 16, player1Card);
+    player2Card.GetNode<Label>("Name").Resized += () =>
+      setPlayerCardScale((player2Card.GetNode<Label>("Name").GetRect().Size.X + 7) / 16, player2Card);
 
-	public override void _Process(double delta)
-	{
-		if (Connection.Instance.PreviousMoves.Count != 0 && currentTimeout <= 0.0f)
-		{
-			var move = Connection.Instance.PreviousMoves[0];
-			Connection.Instance.PreviousMoves.RemoveAt(0);
-			if (move.Item1 == matchData.player1)
-			{
-				spawnRed(move.Item2);
-			}
-			else
-			{
-				spawnYellow(move.Item2);
-			}
+    redChip = GD.Load<PackedScene>(RED_CHIP_PATH);
+    ylwChip = GD.Load<PackedScene>(YELLOW_CHIP_PATH);
 
-			currentTimeout = MOVE_TIMEOUT_BEFORE_PLACE;
-		} 
-		else if (currentTimeout >= 0.0f)
-		{
-			currentTimeout -= delta;
-		}
+    matchData = Connection.Instance.CurrentObservingMatch;
+    player1Card.GetNode<Label>("Name").Text = matchData.player1;
+    player2Card.GetNode<Label>("Name").Text = matchData.player2;
 
-		if (_lastMove)
-		{
-			_lastMoveTimer -= (float) delta;
-		}
+    if (Connection.Instance.PreviousMoves.Count == 0) {
+      player1Card.GetNode<Label>("Status").Show();
+      player2Card.GetNode<Label>("Status").Hide();
+    }
+    else if (Connection.Instance.PreviousMoves.Last().Item1 == matchData.player1) {
+      player1Card.GetNode<Label>("Status").Hide();
+      player2Card.GetNode<Label>("Status").Show();
+    }
+    else {
+      player1Card.GetNode<Label>("Status").Show();
+      player2Card.GetNode<Label>("Status").Hide();
+    }
 
-		if (_lastMoveTimer <= 0.0f)
-		{
-			if (_winner == "")
-			{
-				PopupMessage("Draw!");
-			}
-			else
-			{
-				PopupMessage(_winner + " wins!");
-			}
-		}
-	}
+    Connection.Instance.OnObserveWin += OnObserveWin;
+    Connection.Instance.OnObserveDraw += OnObserveDraw;
+    Connection.Instance.OnObserveTerminated += OnObserveTerminated;
+    Connection.Instance.OnObserveMove += OnObserveMove;
+  }
 
-	public override void _ExitTree()
-	{
-		Connection.Instance.OnObserveWin -= OnObserveWin;
-		Connection.Instance.OnObserveDraw -= OnObserveDraw;
-		Connection.Instance.OnObserveTerminated -= OnObserveTerminated;
-		Connection.Instance.OnObserveMove -= ObserveMove;
-	}
+  public override void _Process(double delta) {
+    if (Connection.Instance.PreviousMoves.Count != 0 && currentTimeout <= 0.0f) {
+      var move = Connection.Instance.PreviousMoves[0];
+      Connection.Instance.PreviousMoves.RemoveAt(0);
+      if (move.Item1 == matchData.player1) {
+        spawnRed(move.Item2);
+      }
+      else {
+        spawnYellow(move.Item2);
+      }
 
-	private void OnObserveWin(string winner)
-	{
-		_lastMove = true; 
-		_winner = winner;
-		player1Card.GetNode<Label>("Status").Hide();
-		player2Card.GetNode<Label>("Status").Hide();
-	}
+      currentTimeout = MOVE_TIMEOUT_BEFORE_PLACE;
+    }
+    else if (currentTimeout >= 0.0f) {
+      currentTimeout -= delta;
+    }
 
-	private void OnObserveDraw()
-	{
-		_lastMove = true;
-		player1Card.GetNode<Label>("Status").Hide();
-		player2Card.GetNode<Label>("Status").Hide();
-	}
+    if (_lastMove) {
+      _lastMoveTimer -= (float)delta;
+    }
 
-	private void OnObserveTerminated()
-	{
-		PopupMessage("Match Terminated");
-		player1Card.GetNode<Label>("Status").Hide();
-		player2Card.GetNode<Label>("Status").Hide();
-	}
-	
-	private void ObserveMove(string username, int column)
-	{
-		if (username == matchData.player1)
-		{
-			if (!_lastMove)
-				player2Card.GetNode<Label>("Status").Show();
-			player1Card.GetNode<Label>("Status").Hide();
-		}
-		else
-		{
-			if (!_lastMove)
-				player1Card.GetNode<Label>("Status").Show();
-			player2Card.GetNode<Label>("Status").Hide();
-		}
-		Connection.Instance.PreviousMoves.Add((username, column));
-	}
+    if (_lastMoveTimer <= 0.0f) {
+      if (_winner == "") {
+        showPopupMessage("Draw!");
+      }
+      else {
+        showPopupMessage(_winner + " wins!");
+      }
+    }
+  }
 
-	private void PopupMessage(string message)
-	{
-		var popup = new Popup();
-		popup.AlwaysOnTop = true;
-		popup.Size = new Vector2I(200, 100);
-		popup.Theme = GD.Load<Theme>("res://assets/theme.tres");
-		var text = new Label();
-		text.Text = message;
-		var sfx = new AudioStreamPlayer();
-		sfx.Stream = endingSfx;
-		sfx.VolumeDb = -2;
-		popup.AddChild(sfx);
-		popup.AddChild(text);
-		text.GrowHorizontal = Control.GrowDirection.Both;
-		text.GrowVertical = Control.GrowDirection.Both;
-		text.HorizontalAlignment = HorizontalAlignment.Center;
-		text.VerticalAlignment = VerticalAlignment.Center;
-		text.AnchorsPreset = (int) Control.LayoutPreset.FullRect;
-		popup.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen;
-		popup.PopupHide += () => popup.QueueFree();
-		GetTree().Root.AddChild(popup);
-		popup.PopupCentered();
-		sfx.Play();
-		popup.Show();
-		TransitionToBracket();
-	}
-	
-	private void TransitionToBracket()
-	{
-		GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
-	}
+  public override void _ExitTree() {
+    Connection.Instance.OnObserveWin -= OnObserveWin;
+    Connection.Instance.OnObserveDraw -= OnObserveDraw;
+    Connection.Instance.OnObserveTerminated -= OnObserveTerminated;
+    Connection.Instance.OnObserveMove -= OnObserveMove;
+  }
 
-	/*
-	 * Determines if the column can have a new chip placed
-	 * Will return -1 if invalid
-	 * or
-	 * Will return row of board in which chip can be placed
-	 */
-	public int canPlaceOnCol(int col) {
-		if(col < 0 || col > 6) // Col out of range
-			return -1;
+  private void OnObserveWin(string winner) {
+    _lastMove = true;
+    _winner = winner;
+    player1Card.GetNode<Label>("Status").Hide();
+    player2Card.GetNode<Label>("Status").Hide();
+  }
 
-		return getNextAvailRow(col);
-	}
+  private void OnObserveDraw() {
+    _lastMove = true;
+    player1Card.GetNode<Label>("Status").Hide();
+    player2Card.GetNode<Label>("Status").Hide();
+  }
 
-	public int getNextAvailRow(int col) {
-		for(int i = chips.GetLength(0) - 1; i >= 0; i--) { // Start at bottom
-			if(chips[i, col] == null)
-				return i;
-		}
+  private void OnObserveTerminated() {
+    showPopupMessage("Match Terminated");
+    player1Card.GetNode<Label>("Status").Hide();
+    player2Card.GetNode<Label>("Status").Hide();
+  }
 
-		return -1;
-	}
+  private void OnObserveMove(string username, int column) {
+    if (username == matchData.player1) {
+      if (!_lastMove)
+        player2Card.GetNode<Label>("Status").Show();
+      player1Card.GetNode<Label>("Status").Hide();
+    }
+    else {
+      if (!_lastMove)
+        player1Card.GetNode<Label>("Status").Show();
+      player2Card.GetNode<Label>("Status").Hide();
+    }
 
-	private void spawnRed(int col) {
-		int row = canPlaceOnCol(col);
-		if(row == -1) {
-			GD.Print("Invalid Placement!");
-			return;
-		}
+    Connection.Instance.PreviousMoves.Add((username, column));
+  }
 
-		RigidBody2D newNode = redChip.Instantiate<RigidBody2D>();
-		AddChild(newNode);
-		newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col), -(CHIP_SIZE + CHIP_PADDING) * 7);
+  private void showPopupMessage(string message) {
+    var popup = new Popup();
+    popup.AlwaysOnTop = true;
+    popup.Size = new Vector2I(200, 100);
+    popup.Theme = GD.Load<Theme>("res://assets/theme.tres");
+    var text = new Label();
+    text.Text = message;
+    var sfx = new AudioStreamPlayer();
+    sfx.Stream = endingSfx;
+    sfx.VolumeDb = -2;
+    popup.AddChild(sfx);
+    popup.AddChild(text);
+    text.GrowHorizontal = Control.GrowDirection.Both;
+    text.GrowVertical = Control.GrowDirection.Both;
+    text.HorizontalAlignment = HorizontalAlignment.Center;
+    text.VerticalAlignment = VerticalAlignment.Center;
+    text.AnchorsPreset = (int)Control.LayoutPreset.FullRect;
+    popup.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen;
+    popup.PopupHide += () => popup.QueueFree();
+    GetTree().Root.AddChild(popup);
+    popup.PopupCentered();
+    sfx.Play();
+    popup.Show();
+    transitionToBracket();
+  }
 
-		chips[row, col] = newNode;
-	}
+  private void transitionToBracket() {
+    GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
+  }
 
-	private void spawnYellow(int col) {
-		int row = canPlaceOnCol(col);
-		if(row == -1) {
-			GD.Print("Invalid Placement!");
-			return;
-		}
+  /*
+   * Determines if the column can have a new chip placed
+   * Will return -1 if invalid
+   * or
+   * Will return row of board in which chip can be placed
+   */
+  private int canPlaceOnCol(int col) {
+    if (col < 0 || col > 6) // Col out of range
+      return -1;
 
-		RigidBody2D newNode = ylwChip.Instantiate<RigidBody2D>();
-		AddChild(newNode);
-		newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col), -(CHIP_SIZE + CHIP_PADDING) * 7); 
+    return getNextAvailRow(col);
+  }
 
-		chips[row, col] = newNode;
-	}
+  private int getNextAvailRow(int col) {
+    for (int i = chips.GetLength(0) - 1; i >= 0; i--) {
+      // Start at bottom
+      if (chips[i, col] == null)
+        return i;
+    }
 
-	private void setPlayerCardScale(float x, Node2D playerCard) {
-		Sprite2D cardCenter = playerCard.GetNode<Sprite2D>("Center");
-		Sprite2D cardRight = playerCard.GetNode<Sprite2D>("Right");
+    return -1;
+  }
 
-		float offX = 16 * x / 2;
-		cardCenter.Scale = new Vector2(x, 2);
-		cardCenter.Position = new Vector2(CARD_CENTER_X_DEFAULT + offX, cardCenter.Position.Y);
+  private void spawnRed(int col) {
+    int row = canPlaceOnCol(col);
+    if (row == -1) {
+      GD.Print("Invalid Placement!");
+      return;
+    }
 
-		cardRight.Position = new Vector2(CARD_CENTER_X_DEFAULT + offX * 2 + 8, cardRight.Position.Y); // 8 is a magic number (im too lazy) for the size of the card edge multipled by 2
-	}
+    RigidBody2D newNode = redChip.Instantiate<RigidBody2D>();
+    AddChild(newNode);
+    newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col),
+      -(CHIP_SIZE + CHIP_PADDING) * 7);
+
+    chips[row, col] = newNode;
+  }
+
+  private void spawnYellow(int col) {
+    int row = canPlaceOnCol(col);
+    if (row == -1) {
+      GD.Print("Invalid Placement!");
+      return;
+    }
+
+    RigidBody2D newNode = ylwChip.Instantiate<RigidBody2D>();
+    AddChild(newNode);
+    newNode.Position = new Vector2(CHIP_SCALE * (CHIP_X_OFF + (CHIP_SIZE + CHIP_PADDING) * col),
+      -(CHIP_SIZE + CHIP_PADDING) * 7);
+
+    chips[row, col] = newNode;
+  }
+
+  private void setPlayerCardScale(float x, Node2D playerCard) {
+    Sprite2D cardCenter = playerCard.GetNode<Sprite2D>("Center");
+    Sprite2D cardRight = playerCard.GetNode<Sprite2D>("Right");
+
+    float offX = 16 * x / 2;
+    cardCenter.Scale = new Vector2(x, 2);
+    cardCenter.Position = new Vector2(CARD_CENTER_X_DEFAULT + offX, cardCenter.Position.Y);
+
+    cardRight.Position =
+      new Vector2(CARD_CENTER_X_DEFAULT + offX * 2 + 8,
+        cardRight.Position.Y); // 8 is a magic number (im too lazy) for the size of the card edge multipled by 2
+  }
 }
 
-enum Direction
-{
-	UP,
-	UP_RIGHT,
-	RIGHT,
-	DOWN_RIGHT,
-	DOWN,
-	DOWN_LEFT,
-	LEFT,
-	UP_LEFT
-}
+enum Direction {
+  UP,
+  UP_RIGHT,
+  RIGHT,
+  DOWN_RIGHT,
+  DOWN,
+  DOWN_LEFT,
+  LEFT,
+  UP_LEFT
+}
\ No newline at end of file
diff --git a/scripts/BracketScene.cs b/scripts/BracketScene.cs
index 4d89cfd..7e76dbb 100644
--- a/scripts/BracketScene.cs
+++ b/scripts/BracketScene.cs
@@ -1,109 +1,93 @@
 using Godot;
 using System.Collections.Generic;
 
-public partial class BracketScene : Control
-{
-	[Export] public Tree Players;
-	[Export] public Tree Matches;
-	[Export] public Texture2D WatchButton;
-	[Export] public Texture2D TerminateKickButton;
-	private const string BOARD_SCENE_PATH = "res://scenes/game.tscn";
-	
-	private List<PlayerData> _playerList;
-	private List<MatchData> _matchList;
-	
-	public override void _Ready()
-	{
-		Players.SetColumnTitle(0, "Name");
-		Players.SetColumnTitle(1, "Ready");
-		Players.SetColumnTitle(2, "Playing");
-		Players.HideRoot = true;
-		Players.ButtonClicked += KickPlayer;
-		
-		
-		Matches.SetColumnTitle(0, "Match");
-		Matches.SetColumnTitle(1, "Red");
-		Matches.SetColumnTitle(2, "Yellow");
-		Matches.HideRoot = true;
-		Matches.ButtonClicked += WatchGame;
-		Matches.ButtonClicked += TerminateGame;
-		
-		Connection.Instance.OnUpdatedPlayers += UpdatePlayers;
-		Connection.Instance.OnUpdatedMatches += UpdateMatches;
-		Connection.Instance.OnWatchGameAck += TransitionToBoard;
-	}
+public partial class BracketScene : Control {
+  [Export] public Tree Players;
+  [Export] public Tree Matches;
+  [Export] public Texture2D WatchButton;
+  [Export] public Texture2D TerminateKickButton;
+  private const string BOARD_SCENE_PATH = "res://scenes/game.tscn";
 
-	public override void _ExitTree()
-	{
-		Connection.Instance.OnUpdatedPlayers -= UpdatePlayers;
-		Connection.Instance.OnUpdatedMatches -= UpdateMatches;
-		Connection.Instance.OnWatchGameAck -= TransitionToBoard;
-	}
+  private List<PlayerData> playerList;
+  private List<MatchData> matchList;
 
-	private void UpdatePlayers(List<PlayerData> playerList)
-	{
-		Players.Clear();
-		_playerList = playerList;
-		_playerList.Sort((a, b) => a.username.CompareTo(b.username));
-		var root = Players.CreateItem();
-		for (int i = 0; i < _playerList.Count; i++)
-		{
-			var item = Players.CreateItem(root);
-			item.SetText(0, playerList[i].username);
-			item.SetText(1, playerList[i].isReady ? "Yes" : "No");
-			item.SetText(2, playerList[i].isPlaying ? "Yes" : "No");
-			if (Connection.Instance.IsAdmin)
-			{
-				item.AddButton(0, TerminateKickButton, i, false, "Kick");
-			}
-		}
-	}
-	
-	private void UpdateMatches(List<MatchData> matchList)
-	{
-		Matches.Clear();
-		_matchList = matchList;
-		var root = Matches.CreateItem();
-		for (int i = 0; i < matchList.Count; i++)
-		{
-			var item = Matches.CreateItem(root);
-			item.SetText(0, matchList[i].matchId.ToString());
-			item.SetText(1, matchList[i].player1);
-			item.SetText(2, matchList[i].player2);
-			item.AddButton(0, WatchButton, i, false, "Watch");
-			if (Connection.Instance.IsAdmin)
-			{
-				item.AddButton(0, TerminateKickButton, 128 + i, false, "Terminate");
-			}
-		}
-	}
+  public override void _Ready() {
+    Players.SetColumnTitle(0, "Name");
+    Players.SetColumnTitle(1, "Ready");
+    Players.SetColumnTitle(2, "Playing");
+    Players.HideRoot = true;
+    Players.ButtonClicked += kickPlayer;
 
-	private void WatchGame(TreeItem item, long column, long id, long mouseButtonIndex)
-	{
-		if (mouseButtonIndex == 1 && column == 0 && id < 128)
-		{
-			Connection.Instance.SendWatchGame(_matchList[(int) id].matchId);
-		} 
-	}
-	
-	private void TerminateGame(TreeItem item, long column, long id, long mouseButtonIndex)
-	{
-		if (mouseButtonIndex == 1 && column == 0 && id - 128 >= 0 && _matchList[(int) id - 128] != null)
-		{
-			Connection.Instance.TerminateGame(_matchList[(int) id - 128].matchId);
-		} 
-	}
-	
-	private void KickPlayer(TreeItem item, long column, long id, long mouseButtonIndex)
-	{
-		if (mouseButtonIndex == 1 && column == 0)
-		{
-			Connection.Instance.KickPlayer(_playerList[(int) id].username);
-		} 
-	}
 
-	private void TransitionToBoard()
-	{
-		GetTree().ChangeSceneToFile(BOARD_SCENE_PATH);
-	}
-}
+    Matches.SetColumnTitle(0, "Match");
+    Matches.SetColumnTitle(1, "Red");
+    Matches.SetColumnTitle(2, "Yellow");
+    Matches.HideRoot = true;
+    Matches.ButtonClicked += watchGame;
+    Matches.ButtonClicked += terminateGame;
+
+    Connection.Instance.OnUpdatedPlayers += updatePlayers;
+    Connection.Instance.OnUpdatedMatches += updateMatches;
+    Connection.Instance.OnWatchGameAck += transitionToBoard;
+  }
+
+  public override void _ExitTree() {
+    Connection.Instance.OnUpdatedPlayers -= updatePlayers;
+    Connection.Instance.OnUpdatedMatches -= updateMatches;
+    Connection.Instance.OnWatchGameAck -= transitionToBoard;
+  }
+
+  private void updatePlayers(List<PlayerData> newPlayerList) {
+    Players.Clear();
+    playerList = newPlayerList;
+    playerList.Sort((a, b) => a.username.CompareTo(b.username));
+    var root = Players.CreateItem();
+    for (int i = 0; i < playerList.Count; i++) {
+      var item = Players.CreateItem(root);
+      item.SetText(0, newPlayerList[i].username);
+      item.SetText(1, newPlayerList[i].isReady ? "Yes" : "No");
+      item.SetText(2, newPlayerList[i].isPlaying ? "Yes" : "No");
+      if (Connection.Instance.IsAdmin) {
+        item.AddButton(0, TerminateKickButton, i, false, "Kick");
+      }
+    }
+  }
+
+  private void updateMatches(List<MatchData> newMatchList) {
+    Matches.Clear();
+    matchList = newMatchList;
+    var root = Matches.CreateItem();
+    for (int i = 0; i < newMatchList.Count; i++) {
+      var item = Matches.CreateItem(root);
+      item.SetText(0, newMatchList[i].matchId.ToString());
+      item.SetText(1, newMatchList[i].player1);
+      item.SetText(2, newMatchList[i].player2);
+      item.AddButton(0, WatchButton, i, false, "Watch");
+      if (Connection.Instance.IsAdmin) {
+        item.AddButton(0, TerminateKickButton, 128 + i, false, "Terminate");
+      }
+    }
+  }
+
+  private void watchGame(TreeItem item, long column, long id, long mouseButtonIndex) {
+    if (mouseButtonIndex == 1 && column == 0 && id < 128) {
+      Connection.Instance.SendWatchGame(matchList[(int)id].matchId);
+    }
+  }
+
+  private void terminateGame(TreeItem item, long column, long id, long mouseButtonIndex) {
+    if (mouseButtonIndex == 1 && column == 0 && id - 128 >= 0 && matchList[(int)id - 128] != null) {
+      Connection.Instance.TerminateGame(matchList[(int)id - 128].matchId);
+    }
+  }
+
+  private void kickPlayer(TreeItem item, long column, long id, long mouseButtonIndex) {
+    if (mouseButtonIndex == 1 && column == 0) {
+      Connection.Instance.KickPlayer(playerList[(int)id].username);
+    }
+  }
+
+  private void transitionToBoard() {
+    GetTree().ChangeSceneToFile(BOARD_SCENE_PATH);
+  }
+}
\ No newline at end of file
diff --git a/scripts/ConnectButtonUI.cs b/scripts/ConnectButtonUI.cs
index 24b99d1..c21d10e 100644
--- a/scripts/ConnectButtonUI.cs
+++ b/scripts/ConnectButtonUI.cs
@@ -1,62 +1,50 @@
 using Godot;
 
-public partial class ConnectButtonUI : Button
-{
-	[Export] public TextEdit AddressField;
-	[Export] public Label ErrorLabel;
-	private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn";
+public partial class ConnectButtonUI : Button {
+  [Export] public TextEdit AddressField;
+  [Export] public Label ErrorLabel;
+  private const string BRACKET_SCENE_PATH = "res://scenes/bracket_view.tscn";
 
-	public override void _Ready()
-	{
-		Connection.Instance.OnWsConnectionSuccess += OnConnectionSuccess;
-		Connection.Instance.OnWsConnectionFailed += OnConnectionFailed;
+  public override void _Ready() {
+    Connection.Instance.OnWsConnectionSuccess += OnConnectionSuccess;
+    Connection.Instance.OnWsConnectionFailed += OnConnectionFailed;
 
-		if (Connection.Instance.LastUsedConnectionAddress.Length > 0)
-		{
-			AddressField.Text = Connection.Instance.LastUsedConnectionAddress;
-		}
+    if (Connection.Instance.LastUsedConnectionAddress.Length > 0) {
+      AddressField.Text = Connection.Instance.LastUsedConnectionAddress;
+    }
 
-		if (Connection.Instance.LastError.Length > 0)
-		{
-			ErrorLabel.Text = Connection.Instance.LastError;
-		}
+    if (Connection.Instance.LastError.Length > 0) {
+      ErrorLabel.Text = Connection.Instance.LastError;
+    }
 
-		AddressField.GuiInput += e =>
-		{
-			if (AddressField.HasFocus() && e is InputEventKey inputEventKey && inputEventKey.IsPressed())
-			{
-				if (inputEventKey.KeyLabel == Key.Enter)
-				{
-					Connection.Instance.Connect(AddressField.Text);
-					GetViewport().SetInputAsHandled();
-				}
+    AddressField.GuiInput += e => {
+      if (AddressField.HasFocus() && e is InputEventKey inputEventKey && inputEventKey.IsPressed()) {
+        if (inputEventKey.KeyLabel == Key.Enter) {
+          Connection.Instance.Connect(AddressField.Text);
+          GetViewport().SetInputAsHandled();
+        }
 
-				if (inputEventKey.KeyLabel == Key.Space)
-				{
-					GetViewport().SetInputAsHandled();
-				}
-			}
-		};
-	}
+        if (inputEventKey.KeyLabel == Key.Space) {
+          GetViewport().SetInputAsHandled();
+        }
+      }
+    };
+  }
 
-	public override void _ExitTree()
-	{
-		Connection.Instance.OnWsConnectionSuccess -= OnConnectionSuccess;
-		Connection.Instance.OnWsConnectionFailed -= OnConnectionFailed;
-	}
+  public override void _ExitTree() {
+    Connection.Instance.OnWsConnectionSuccess -= OnConnectionSuccess;
+    Connection.Instance.OnWsConnectionFailed -= OnConnectionFailed;
+  }
 
-	public override void _Pressed()
-	{
-		Connection.Instance.Connect(AddressField.Text);
-	}
+  public override void _Pressed() {
+    Connection.Instance.Connect(AddressField.Text);
+  }
 
-	private void OnConnectionSuccess()
-	{
-		GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
-	}
+  private void OnConnectionSuccess() {
+    GetTree().ChangeSceneToFile(BRACKET_SCENE_PATH);
+  }
 
-	private void OnConnectionFailed()
-	{
-		ErrorLabel.Text = "Couldn't connect to server! " + Connection.Instance.LastError;
-	}
-}
+  private void OnConnectionFailed() {
+    ErrorLabel.Text = "Couldn't connect to server! " + Connection.Instance.LastError;
+  }
+}
\ No newline at end of file
diff --git a/scripts/Connection.cs b/scripts/Connection.cs
index dce4126..b438305 100644
--- a/scripts/Connection.cs
+++ b/scripts/Connection.cs
@@ -1,588 +1,564 @@
 using Godot;
 using System;
 using System.Collections.Generic;
-using System.Threading;
 
-public partial class Connection : Node
-{
-	public const string WS_DEFAULT_ADDRESS = "wss://connect4.abunchofknowitalls.com";
+public partial class Connection : Node {
+  public const string WS_DEFAULT_ADDRESS = "wss://connect4.abunchofknowitalls.com";
 
-	public static Connection Instance { get; private set; }
+  private static TournamentType? parseTournamentType(string type) {
+    switch (type) {
+      case "RoundRobin":
+        return TournamentType.RoundRobin;
+      case "false":
+        return TournamentType.None;
+      default:
+        return null;
+    }
+  }
 
-	private WebSocketPeer _webSocket = new ();
-	private Thread _gameListThread;
-	private bool _gameListThreadRunning;
+  public static Connection Instance { get; private set; }
 
-	public event Action OnConnected;
-	public event Action OnReadyAcknowledged;
-	public event Action<bool> OnGameStart;
-	public event Action OnGameWin;
-	public event Action OnGameLoss;
-	public event Action OnGameDraw;
-	public event Action OnGameTerminated;
-	public event Action<int> OnOpponentMove;
+  private WebSocketPeer webSocket = new WebSocketPeer();
+  public event Action OnConnected;
+  public event Action OnReadyAcknowledged;
+  public event Action<bool> OnGameStart;
+  public event Action OnGameWin;
+  public event Action OnGameLoss;
+  public event Action OnGameDraw;
+  public event Action OnGameTerminated;
+  public event Action<int> OnOpponentMove;
 
-	public event Action OnWatchGameAck;
-	public event Action<string> OnObserveWin;
-	public event Action OnObserveDraw;
-	public event Action OnObserveTerminated;
-	public event Action<string, int> OnObserveMove;
-	public event Action<List<MatchData>> OnUpdatedMatches;
-	public event Action<List<PlayerData>> OnUpdatedPlayers;
-	public event Action OnStartTournamentAck;
-	public event Action OnTournamentEnd;
-	public event Action OnCancelTournamentAck;
-	public event Action OnBecomeAdmin;
-	public event Action OnGetDataAcks;
+  public event Action OnWatchGameAck;
+  public event Action<string> OnObserveWin;
+  public event Action OnObserveDraw;
+  public event Action OnObserveTerminated;
+  public event Action<string, int> OnObserveMove;
+  public event Action<List<MatchData>> OnUpdatedMatches;
+  public event Action<List<PlayerData>> OnUpdatedPlayers;
+  public event Action OnStartTournament;
+  public event Action OnTournamentEnd;
+  public event Action OnCancelTournamentAck;
+  public event Action OnBecomeAdmin;
+  public event Action OnGetDataAcks;
+  public event Action OnSetDataAcks;
 
-	public event Action OnWsConnectionSuccess;
-	public event Action OnWsConnectionFailed;
-	public event Action OnWsDisconnect;
+  public event Action OnWsConnectionSuccess;
+  public event Action OnWsConnectionFailed;
+  public event Action OnWsDisconnect;
 
-	// Already prints to console
-	public event Action<string> OnError;
+  // Already prints to console
+  public event Action<string> OnError;
 
-	public bool IsAdmin { get; private set; }
-	public bool IsPlayer { get; private set; }
-	public bool ActiveTournament { get; private set; }
-	public bool DemoMode { get; private set; }
-	public List<(string, int)> PreviousMoves { get; private set; } = [];
-	public double CurrentWaitTimeout { get; private set; } = 5.0;
-	public MatchData CurrentObservingMatch { get; private set; }
-	public string LastUsedConnectionAddress { get; private set; } = "";
-	public string LastError { get; private set; } = "";
+  public bool IsAdmin { get; private set; }
+  public bool IsPlayer { get; private set; }
+  public TournamentType ActiveTournament { get; private set; }
+  public bool DemoMode { get; private set; }
+  public List<(string, int)> PreviousMoves { get; private set; } = [];
+  public double CurrentWaitTimeout { get; private set; } = 5.0;
+  public double MaxTimeout { get; private set; } = 30.0;
+  public MatchData CurrentObservingMatch { get; private set; }
+  public string LastUsedConnectionAddress { get; private set; } = "";
+  public string LastError { get; private set; } = "";
 
-	private bool IsSocketOpen => _webSocket.GetReadyState() == WebSocketPeer.State.Open;
+  private bool IsSocketOpen => webSocket.GetReadyState() == WebSocketPeer.State.Open;
 
-	private bool _connecting = false;
-	private bool _connected = false;
-	private List<(string, int)> _lastScoreboard = [];
-	private bool _shouldShowTournamentResults = false;
-	private float _refreshGamePlayerListTimer = 5.0f;
+  private bool isConnecting = false;
+  private bool isConnected = false;
+  private List<(string, int)> lastScoreboard = [];
+  private bool shouldShowTournamentResults = false;
+  private float refreshGamePlayerListTimer = 5.0f;
 
-	public override void _Ready()
-	{
-		Instance = this;
-		_webSocket.SetHeartbeatInterval(5.0);
-		_webSocket.HeartbeatInterval = 5.0;
-		Instance.OnWsDisconnect += () => GetTree().ChangeSceneToFile("res://scenes/main_menu.tscn");
-	}
+  public override void _Ready() {
+    Instance = this;
+    webSocket.SetHeartbeatInterval(5.0);
+    webSocket.HeartbeatInterval = 5.0;
+    Instance.OnWsDisconnect += () => GetTree().ChangeSceneToFile("res://scenes/main_menu.tscn");
+  }
 
-	public void Connect(string address)
-	{
-		_connecting = true;
-		LastUsedConnectionAddress = address;
-		if (_connected)
-		{
-			return;
-		}
+  public void Connect(string address) {
+    isConnecting = true;
+    LastUsedConnectionAddress = address;
+    if (isConnected) {
+      return;
+    }
 
-		Error error = _webSocket.ConnectToUrl(address);
-		if (error != Error.Ok)
-		{
-			LastError = error.ToString();
-		}
-	}
+    Error error = webSocket.ConnectToUrl(address);
+    if (error != Error.Ok) {
+      LastError = error.ToString();
+    }
+  }
 
-	public override void _Process(double delta)
-	{
-		_webSocket.Poll();
-		WebSocketPeer.State state = _webSocket.GetReadyState();
-		if (state == WebSocketPeer.State.Open)
-		{
-			if (_connecting)
-			{
-				_connecting = false;
-				_connected = true;
-				LastError = "";
-				OnWsConnectionSuccess?.Invoke();
-				UpdateGameList();
-				UpdatePlayerList();
-				_refreshGamePlayerListTimer = 5.0f;
-			} else if (_refreshGamePlayerListTimer <= 0.0f)
-			{
-				UpdateGameList();
-				UpdatePlayerList();
-				_refreshGamePlayerListTimer = 5.0f;
-			}
-			else
-			{
-				_refreshGamePlayerListTimer -= (float) delta;
-			}
-			
-			while (_webSocket.GetAvailablePacketCount() > 0)
-			{
-				string message = _webSocket.GetPacket().GetStringFromUtf8();
-				HandleServerMessage(message);
-			}
+  public override void _Process(double delta) {
+    webSocket.Poll();
+    WebSocketPeer.State state = webSocket.GetReadyState();
+    if (state == WebSocketPeer.State.Open) {
+      if (isConnecting) {
+        isConnecting = false;
+        isConnected = true;
+        LastError = "";
+        OnWsConnectionSuccess?.Invoke();
+        UpdateGameList();
+        UpdatePlayerList();
+        refreshGamePlayerListTimer = 5.0f;
+      }
+      else if (refreshGamePlayerListTimer <= 0.0f) {
+        UpdateGameList();
+        UpdatePlayerList();
+        refreshGamePlayerListTimer = 5.0f;
+      }
+      else {
+        refreshGamePlayerListTimer -= (float)delta;
+      }
 
-			if (_shouldShowTournamentResults)
-			{
-				var children = GetTree().Root.GetChildren();
-				foreach (var child in children)
-				{
-					if (child.Name.ToString() == "BracketView")
-					{
-						_shouldShowTournamentResults = false;
-						ShowTournamentScoreboard(_lastScoreboard);
-					}
-				}
-			}
-		} 
-		else if (state == WebSocketPeer.State.Connecting)
-		{
-			// Do nothing
-		}
-		else if (state == WebSocketPeer.State.Closing)
-		{
-			// Do nothing
-		}
-		else if (state == WebSocketPeer.State.Closed)
-		{
-			if (_connecting)
-			{
-				_connecting = false;
-				OnWsConnectionFailed?.Invoke();
-			}
-			else if (_connected)
-			{
-				_connected = false;
-				IsAdmin = false;
-				CurrentWaitTimeout = 5.0;
-				ActiveTournament = false;
-				DemoMode = false;
-				_refreshGamePlayerListTimer = 5.0f;
-				var code = _webSocket.GetCloseCode();
-				var reason = _webSocket.GetCloseReason();
-				LastError = "Unexpected Disconnect. Reason: " + reason +  ", Code: " + code;
-				GD.PrintErr("WebSocket closed with code: " + code + ", reason " + reason + ". Clean: " + (code != -1));
-				OnWsDisconnect?.Invoke();
-			}
-		}
-	}
+      while (webSocket.GetAvailablePacketCount() > 0) {
+        string message = webSocket.GetPacket().GetStringFromUtf8();
+        handleServerMessage(message);
+      }
 
-	// Player commands
-	public void SendConnect(string clientId)
-	{
-		if (string.IsNullOrWhiteSpace(clientId))
-		{
-			GD.PrintErr("Client ID is required to CONNECT.");
-			return;
-		}
+      if (shouldShowTournamentResults) {
+        var children = GetTree().Root.GetChildren();
+        foreach (var child in children) {
+          if (child.Name.ToString() == "BracketView") {
+            shouldShowTournamentResults = false;
+            ShowTournamentScoreboard(lastScoreboard);
+          }
+        }
+      }
+    }
+    else if (state == WebSocketPeer.State.Connecting) {
+      // Do nothing
+    }
+    else if (state == WebSocketPeer.State.Closing) {
+      // Do nothing
+    }
+    else if (state == WebSocketPeer.State.Closed) {
+      if (isConnecting) {
+        isConnecting = false;
+        OnWsConnectionFailed?.Invoke();
+      }
+      else if (isConnected) {
+        isConnected = false;
+        IsAdmin = false;
+        CurrentWaitTimeout = 5.0;
+        ActiveTournament = TournamentType.None;
+        DemoMode = false;
+        refreshGamePlayerListTimer = 5.0f;
+        var code = webSocket.GetCloseCode();
+        var reason = webSocket.GetCloseReason();
+        LastError = "Unexpected Disconnect. Reason: " + reason + ", Code: " + code;
+        GD.PrintErr("WebSocket closed with code: " + code + ", reason " + reason + ". Clean: " + (code != -1));
+        OnWsDisconnect?.Invoke();
+      }
+    }
+  }
 
-		clientId = clientId.Trim();
+  // Player commands
+  public void SendConnect(string clientId) {
+    if (string.IsNullOrWhiteSpace(clientId)) {
+      GD.PrintErr("Client ID is required to CONNECT.");
+      return;
+    }
 
-		if (clientId.Contains(":"))
-		{
-			GD.PrintErr("Client ID cannot contain ':' characters.");
-			return;
-		}
+    clientId = clientId.Trim();
 
-		SendCommand("CONNECT", clientId);
-	}
+    if (clientId.Contains(":")) {
+      GD.PrintErr("Client ID cannot contain ':' characters.");
+      return;
+    }
 
-	public void SendReady()
-	{
-		SendCommand("READY");
-	}
+    sendCommand("CONNECT", clientId);
+  }
 
-	public void SendPlay(int column)
-	{
-		SendCommand("PLAY", column.ToString());
-	}
+  public void SendDisconnect() {
+    sendCommand("DISCONNECT");
+  }
 
-	// Observer commands
-	public void UpdateGameList()
-	{
-		SendCommand("GAME", "LIST");
-	}
+  public void SendReady() {
+    sendCommand("READY");
+  }
 
-	public void UpdatePlayerList()
-	{
-		SendCommand("PLAYER", "LIST");
-	}
+  public void SendPlay(int column) {
+    sendCommand("PLAY", column.ToString());
+  }
 
-	public void SendWatchGame(int matchID)
-	{
-		SendCommand("GAME", "WATCH:" + matchID);
-	}
+  // Observer commands
+  public void UpdateGameList() {
+    sendCommand("GAME", "LIST");
+  }
 
-	public void AdminAuth(string password)
-	{
-		if (IsAdmin) return;
-		SendCommand("ADMIN", "AUTH:" + password);
-	}
+  public void UpdatePlayerList() {
+    sendCommand("PLAYER", "LIST");
+  }
 
-	public void GetMoveWait()
-	{
-		SendCommand("GET", "MOVE_WAIT");
-	}
+  public void SendWatchGame(int matchID) {
+    sendCommand("GAME", "WATCH:" + matchID);
+  }
 
-	public void GetTournamentStatus()
-	{
-		SendCommand("GET", "TOURNAMENT_STATUS");
-	}
+  public void AdminAuth(string password) {
+    if (IsAdmin) return;
+    sendCommand("ADMIN", "AUTH:" + password);
+  }
+
+  public void GetMoveWait() {
+    sendCommand("GET", "MOVE_WAIT");
+  }
+
+  public void GetTournamentStatus() {
+    sendCommand("GET", "TOURNAMENT_STATUS");
+  }
+
+  public void GetDemoMode() {
+    sendCommand("GET", "DEMO_MODE");
+  }
+
+  public void GetMaxTimeout() {
+    sendCommand("GET", "MAX_TIMEOUT");
+  }
 
 
-	// Admin commands
-	public void KickPlayer(string playerId)
-	{
-		if (!IsAdmin) return;
-		SendCommand("ADMIN", "KICK:" + playerId);
-	}
+  // Admin commands
+  public void KickPlayer(string playerId) {
+    if (!IsAdmin) return;
+    sendCommand("ADMIN", "KICK:" + playerId);
+  }
 
-	public void StartTournament()
-	{
-		if (!IsAdmin) return;
-		SendCommand("TOURNAMENT", "START");
-	}
+  public void StartTournament(string tournamentType = "RoundRobin") {
+    if (!IsAdmin) return;
+    sendCommand("TOURNAMENT", "START:" + tournamentType);
+  }
 
-	public void CancelTournament()
-	{
-		if (!IsAdmin) return;
-		SendCommand("TOURNAMENT", "CANCEL");
-	}
+  public void CancelTournament() {
+    if (!IsAdmin) return;
+    sendCommand("TOURNAMENT", "CANCEL");
+  }
 
-	public void TerminateGame(int matchID)
-	{
-		if (!IsAdmin) return;
-		SendCommand("GAME", "TERMINATE:" + matchID);
-	}
+  public void TerminateGame(int matchID) {
+    if (!IsAdmin) return;
+    sendCommand("GAME", "TERMINATE:" + matchID);
+  }
 
-	public void SetTournamentWait(float waitTime)
-	{
-		if (!IsAdmin) return;
-		CurrentWaitTimeout = waitTime;
-		SendCommand("TOURNAMENT", "WAIT:" + waitTime);
-	}
+  public void SetMoveWait(float waitTime) {
+    if (!IsAdmin) return;
+    CurrentWaitTimeout = waitTime;
+    sendCommand("SET", "MOVE_WAIT:" + waitTime);
+  }
 
-	private void SendCommand(string header, string body = "")
-	{
-		if (!IsSocketOpen)
-		{
-			GD.PrintErr($"Cannot send {header}, socket is not open.");
-			return;
-		}
+  public void SetDemoMode(bool demoMode) {
+    if (!IsAdmin) return;
+    DemoMode = demoMode;
+    sendCommand("SET", "DEMO_MODE:" + demoMode);
+  }
 
-		string payload = string.IsNullOrEmpty(body) ? header : $"{header}:{body}";
-		_webSocket.SendText(payload);
-	}
+  public void SetMaxTimeout(float maxTimeout) {
+    if (!IsAdmin) return;
+    MaxTimeout = maxTimeout;
+    sendCommand("SET", "MAX_TIMEOUT:" + maxTimeout);
+  }
 
-	private void HandleServerMessage(string message)
-	{
-		if (string.IsNullOrWhiteSpace(message))
-		{
-			return;
-		}
+  private void sendCommand(string header, string body = "") {
+    if (!IsSocketOpen) {
+      GD.PrintErr($"Cannot send {header}, socket is not open.");
+      return;
+    }
 
-		message = message.Trim();
+    string payload = string.IsNullOrEmpty(body) ? header : $"{header}:{body}";
+    webSocket.SendText(payload);
+  }
 
-		string header;
-		string body;
-		int separatorIndex = message.IndexOf(':');
-		if (separatorIndex >= 0)
-		{
-			header = message.Substring(0, separatorIndex).Trim();
-			body = message.Substring(separatorIndex + 1).Trim();
-		}
-		else
-		{
-			header = message.Trim();
-			body = string.Empty;
-		}
+  private void handleServerMessage(string message) {
+    if (string.IsNullOrWhiteSpace(message)) {
+      return;
+    }
 
-		header = header.ToUpperInvariant();
+    message = message.Trim();
 
-		switch (header)
-		{
-			case "CONNECT":
-				if (body.Equals("ACK", StringComparison.OrdinalIgnoreCase))
-				{
-					IsPlayer = true;
-					OnConnected?.Invoke();
-				}
+    string header;
+    string body;
+    int separatorIndex = message.IndexOf(':');
+    if (separatorIndex >= 0) {
+      header = message.Substring(0, separatorIndex).Trim();
+      body = message.Substring(separatorIndex + 1).Trim();
+    }
+    else {
+      header = message.Trim();
+      body = string.Empty;
+    }
 
-				break;
-			case "READY":
-				if (body.Equals("ACK", StringComparison.OrdinalIgnoreCase))
-				{
-					OnReadyAcknowledged?.Invoke();
-				}
+    header = header.ToUpperInvariant();
 
-				break;
-			case "GAME":
-				HandleGameMessage(body);
-				break;
-			case "PLAYER":
-				HandlePlayerList(body);
-				break;
-			case "OPPONENT":
-				if (int.TryParse(body, out int column))
-				{
-					OnOpponentMove?.Invoke(column);
-				}
-				else
-				{
-					GD.PrintErr($"Invalid opponent column: {body}");
-				}
+    switch (header) {
+      case "CONNECT":
+        if (body.Equals("ACK", StringComparison.OrdinalIgnoreCase)) {
+          IsPlayer = true;
+          OnConnected?.Invoke();
+        }
 
-				break;
-			case "ADMIN":
-				if (body == "AUTH:ACK")
-				{
-					IsAdmin = true;
-					GetMoveWait();
-					GetTournamentStatus();
-					OnBecomeAdmin?.Invoke();
-				}
+        break;
+      case "READY":
+        if (body.Equals("ACK", StringComparison.OrdinalIgnoreCase)) {
+          OnReadyAcknowledged?.Invoke();
+        }
 
-				break;
-			case "TOURNAMENT":
-				HandleTournamentMessage(body);
-				break;
-			case "GET":
-				if (body.StartsWith("MOVE_WAIT"))
-				{
-					CurrentWaitTimeout = double.Parse(body.Split(":")[1]);
-				} 
-				else if (body.StartsWith("TOURNAMENT_STATUS"))
-				{
-					string status = body.Split(":")[1];
-					if (status != "DEMO")
-					{
-						ActiveTournament = bool.Parse(status);
-					}
-					else
-					{
-						ActiveTournament = false;
-						DemoMode = true;
-					}
-				}
-				OnGetDataAcks?.Invoke();
-				break;
-			case "ERROR":
-				GD.PrintErr(message);
-				OnError?.Invoke(message);
-				break;
-			default:
-				GD.Print($"Unhandled server message: {message}");
-				break;
-		}
-	}
+        break;
+      case "GAME":
+        handleGameMessage(body);
+        break;
+      case "PLAYER":
+        handlePlayerList(body);
+        break;
+      case "OPPONENT":
+        if (int.TryParse(body, out int column)) {
+          OnOpponentMove?.Invoke(column);
+        }
+        else {
+          GD.PrintErr($"Invalid opponent column: {body}");
+        }
 
-	private void HandleTournamentMessage(string body)
-	{
-		if (string.IsNullOrWhiteSpace(body))
-		{
-			return;
-		}
+        break;
+      case "ADMIN":
+        if (body == "AUTH:ACK") {
+          IsAdmin = true;
+          GetMoveWait();
+          GetTournamentStatus();
+          OnBecomeAdmin?.Invoke();
+        }
 
-		string[] segments = body.Split(':');
-		string command = segments[0].Trim().ToUpperInvariant();
-		string argument = segments.Length > 1 ? segments[1].Trim() : string.Empty;
+        break;
+      case "TOURNAMENT":
+        handleTournamentMessage(body);
+        break;
+      case "GET":
+        string data = body.Split(":")[1];
+        if (body.StartsWith("MOVE_WAIT")) {
+          CurrentWaitTimeout = double.Parse(data);
+        }
+        else if (body.StartsWith("MAX_TIMEOUT")) {
+          MaxTimeout = double.Parse(data);
+        }
+        else if (body.StartsWith("DEMO_MODE")) {
+          DemoMode = bool.Parse(data);
+        }
+        else if (body.StartsWith("TOURNAMENT_STATUS")) {
+          TournamentType? type = parseTournamentType(data);
 
-		switch (command)
-		{
-			case "END":
-			{
-				ActiveTournament = false;
-				List<(string, int)> playerScoreboard = new List<(string, int)>();
-				string[] entries = segments[1].Split("|");
-				foreach (string entry in entries)
-				{
-					string[] data = entry.Split(',');
-					playerScoreboard.Add((data[0], int.Parse(data[1])));
-				}
+          if (type == null) {
+            GD.PrintErr($"Unhandled tournament type: {data}");
+          }
+          else {
+            ActiveTournament = type.Value;
+          }
+        }
+        else {
+          GD.PrintErr($"Unhandled data get: {body}");
+        }
 
-				_lastScoreboard = playerScoreboard;
-				_shouldShowTournamentResults = true;
-				OnTournamentEnd?.Invoke();
-				break;
-			}
-			case "START":
-			{
-				ActiveTournament = true;
-				OnStartTournamentAck?.Invoke();
-				break;
-			}
-			case "CANCEL":
-			{
-				ActiveTournament = false;
-				OnCancelTournamentAck?.Invoke();
-				break;
-			}
-		}
-	}
+        OnGetDataAcks?.Invoke();
+        break;
+      case "SET":
+        OnSetDataAcks?.Invoke();
+        break;
+      case "ERROR":
+        GD.PrintErr(message);
+        OnError?.Invoke(message);
+        break;
+      default:
+        GD.Print($"Unhandled server message: {message}");
+        break;
+    }
+  }
 
-	private void HandlePlayerList(string body)
-	{
-		if (string.IsNullOrWhiteSpace(body))
-		{
-			return;
-		}
+  private void handleTournamentMessage(string body) {
+    if (string.IsNullOrWhiteSpace(body)) {
+      return;
+    }
 
-		string[] segments = body.Split(':');
-		string command = segments[0].Trim().ToUpperInvariant();
-		string argument = segments.Length > 1 ? segments[1].Trim() : string.Empty;
+    string[] segments = body.Split(':');
+    string command = segments[0].Trim().ToUpperInvariant();
+    string argument = segments.Length > 1 ? segments[1].Trim() : string.Empty;
 
-		switch (command)
-		{
-			case "LIST":
-			{
-				List<PlayerData> players = new List<PlayerData>();
+    switch (command) {
+      case "END": {
+        ActiveTournament = TournamentType.None;
+        List<(string, int)> playerScoreboard = new List<(string, int)>();
+        string[] entries = segments[1].Split("|");
+        foreach (string entry in entries) {
+          string[] data = entry.Split(',');
+          playerScoreboard.Add((data[0], int.Parse(data[1])));
+        }
 
-				if (segments.Length < 2)
-				{
-					OnUpdatedPlayers?.Invoke(players);
-					break;
-				}
+        lastScoreboard = playerScoreboard;
+        shouldShowTournamentResults = true;
+        OnTournamentEnd?.Invoke();
+        break;
+      }
+      case "START": {
+        TournamentType? type = parseTournamentType(argument);
+        if (type == null) {
+          GD.PrintErr($"Unhandled tournament type: {argument}");
+        }
+        else {
+          ActiveTournament = type.Value;
+          OnStartTournament?.Invoke();
+        }
 
-				string[] entries = segments[1].Split("|");
-				foreach (string entry in entries)
-				{
-					string[] data = entry.Split(',');
-					players.Add(new PlayerData(data[0], bool.Parse(data[1]), bool.Parse(data[2])));
-				}
+        break;
+      }
+      case "CANCEL": {
+        ActiveTournament = TournamentType.None;
+        OnCancelTournamentAck?.Invoke();
+        break;
+      }
+    }
+  }
 
-				OnUpdatedPlayers?.Invoke(players);
-				break;
-			}
-		}
-	}
+  private void handlePlayerList(string body) {
+    if (string.IsNullOrWhiteSpace(body)) {
+      return;
+    }
 
-	private void HandleGameMessage(string body)
-	{
-		if (string.IsNullOrWhiteSpace(body))
-		{
-			return;
-		}
+    string[] segments = body.Split(':');
+    string command = segments[0].Trim().ToUpperInvariant();
 
-		string[] segments = body.Split(':');
-		string command = segments[0].Trim().ToUpperInvariant();
-		string argument = segments.Length > 1 ? segments[1].Trim() : string.Empty;
+    switch (command) {
+      case "LIST": {
+        List<PlayerData> players = new List<PlayerData>();
 
-		if (IsPlayer)
-		{
-			switch (command)
-			{
-				case "START":
-					bool isFirst = argument == "1" || argument.Equals("TRUE", StringComparison.OrdinalIgnoreCase);
-					OnGameStart?.Invoke(isFirst);
-					break;
-				case "WINS":
-					OnGameWin?.Invoke();
-					break;
-				case "LOSS":
-					OnGameLoss?.Invoke();
-					break;
-				case "DRAW":
-					OnGameDraw?.Invoke();
-					break;
-				case "TERMINATED":
-					OnGameTerminated?.Invoke();
-					break;
-				default:
-					GD.Print($"Unhandled GAME message: {body}");
-					break;
-			}
-		}
-		else // Regular observer/admin
-		{
-			switch (command)
-			{
-				case "WIN":
-					OnObserveWin?.Invoke(segments[1]);
-					break;
-				case "MOVE":
-					OnObserveMove?.Invoke(segments[1], int.Parse(segments[2]));
-					break;
-				case "DRAW":
-					OnObserveDraw?.Invoke();
-					break;
-				case "TERMINATED":
-					OnObserveTerminated?.Invoke();
-					break;
-				case "LIST":
-					List<MatchData> matches = new List<MatchData>();
+        if (segments.Length < 2) {
+          OnUpdatedPlayers?.Invoke(players);
+          break;
+        }
 
-					if (segments.Length < 2)
-					{
-						OnUpdatedMatches?.Invoke(matches);
-						break;
-					}
+        string[] entries = segments[1].Split("|");
+        foreach (string entry in entries) {
+          string[] data = entry.Split(',');
+          players.Add(new PlayerData(data[0], bool.Parse(data[1]), bool.Parse(data[2])));
+        }
 
-					string[] entries = segments[1].Split("|");
-					foreach (string entry in entries)
-					{
-						string[] data = entry.Split(',');
-						matches.Add(new MatchData(int.Parse(data[0]), data[1], data[2]));
-					}
+        OnUpdatedPlayers?.Invoke(players);
+        break;
+      }
+    }
+  }
 
-					OnUpdatedMatches?.Invoke(matches);
-					break;
-				case "WATCH":
-					CurrentObservingMatch = null;
-					PreviousMoves.Clear();
-					string[] activeMatchData = segments[2].Split("|");
-					if (activeMatchData.IsEmpty())
-					{
-						string[] matchData = segments[2].Split(',');
-						CurrentObservingMatch = new MatchData(int.Parse(matchData[0]), matchData[1], matchData[2]);
-					}
-					else
-					{
-						string[] matchData = activeMatchData[0].Split(',');
-						CurrentObservingMatch = new MatchData(int.Parse(matchData[0]), matchData[1], matchData[2]);
-						for (int i = 1; i < activeMatchData.Length; i++)
-						{
-							string[] moveData = activeMatchData[i].Split(',');
-							PreviousMoves.Add((moveData[0], int.Parse(moveData[1])));
-						}
-					}
-					OnWatchGameAck?.Invoke();
-					break;
-				default:
-					GD.Print($"Unhandled GAME message: {body}");
-					break;
-			}
-		}
-	}
-	
-	public void ShowTournamentScoreboard(List<(string, int)> playerScoreboard)
-	{
-		var scoreboardWindow = new Window();
-		scoreboardWindow.Theme = GD.Load<Theme>("res://assets/theme.tres");
-		scoreboardWindow.AlwaysOnTop = true;
-		scoreboardWindow.MaximizeDisabled = true;
-		scoreboardWindow.Unresizable = true;
-		scoreboardWindow.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen;
-		scoreboardWindow.Size = new Vector2I(256, 512);
-		scoreboardWindow.CloseRequested += () =>
-		{
-			GetTree().Root.RemoveChild(scoreboardWindow);
-		};
-		
-		var tree = new Tree();
-		tree.HideRoot = true;
-		tree.Columns = 2;
-		tree.ColumnTitlesVisible = true;
-		tree.Theme = GD.Load<Theme>("res://assets/theme.tres");
-		tree.GrowHorizontal = Control.GrowDirection.Both;
-		tree.GrowVertical = Control.GrowDirection.Both;
-		tree.SetColumnTitle(0, "Player");
-		tree.SetColumnTitle(1, "Score");
-		var root = tree.CreateItem();
-		
-		foreach ((string, int) entry in playerScoreboard)
-		{
-			var item = tree.CreateItem(root);
-			item.SetText(0, entry.Item1);
-			item.SetText(1, entry.Item2.ToString());
-		}
-		
-		scoreboardWindow.AddChild(tree);
-		tree.SetAnchorsPreset(Control.LayoutPreset.FullRect);
-		
-		GetTree().Root.AddChild(scoreboardWindow);
-	}
-}
+  private void handleGameMessage(string body) {
+    if (string.IsNullOrWhiteSpace(body)) {
+      return;
+    }
+
+    string[] segments = body.Split(':');
+    string command = segments[0].Trim().ToUpperInvariant();
+    string argument = segments.Length > 1 ? segments[1].Trim() : string.Empty;
+
+    if (IsPlayer) {
+      switch (command) {
+        case "START":
+          bool isFirst = argument == "1" || argument.Equals("TRUE", StringComparison.OrdinalIgnoreCase);
+          OnGameStart?.Invoke(isFirst);
+          break;
+        case "WINS":
+          OnGameWin?.Invoke();
+          break;
+        case "LOSS":
+          OnGameLoss?.Invoke();
+          break;
+        case "DRAW":
+          OnGameDraw?.Invoke();
+          break;
+        case "TERMINATED":
+          OnGameTerminated?.Invoke();
+          break;
+        default:
+          GD.Print($"Unhandled GAME message: {body}");
+          break;
+      }
+    }
+    else // Regular observer/admin
+    {
+      switch (command) {
+        case "WIN":
+          OnObserveWin?.Invoke(segments[1]);
+          break;
+        case "MOVE":
+          OnObserveMove?.Invoke(segments[1], int.Parse(segments[2]));
+          break;
+        case "DRAW":
+          OnObserveDraw?.Invoke();
+          break;
+        case "TERMINATED":
+          OnObserveTerminated?.Invoke();
+          break;
+        case "LIST":
+          List<MatchData> matches = new List<MatchData>();
+
+          if (segments.Length < 2) {
+            OnUpdatedMatches?.Invoke(matches);
+            break;
+          }
+
+          string[] entries = segments[1].Split("|");
+          foreach (string entry in entries) {
+            string[] data = entry.Split(',');
+            matches.Add(new MatchData(int.Parse(data[0]), data[1], data[2]));
+          }
+
+          OnUpdatedMatches?.Invoke(matches);
+          break;
+        case "WATCH":
+          CurrentObservingMatch = null;
+          PreviousMoves.Clear();
+          string[] activeMatchData = segments[2].Split("|");
+          if (activeMatchData.IsEmpty()) {
+            string[] matchData = segments[2].Split(',');
+            CurrentObservingMatch = new MatchData(int.Parse(matchData[0]), matchData[1], matchData[2]);
+          }
+          else {
+            string[] matchData = activeMatchData[0].Split(',');
+            CurrentObservingMatch = new MatchData(int.Parse(matchData[0]), matchData[1], matchData[2]);
+            for (int i = 1; i < activeMatchData.Length; i++) {
+              string[] moveData = activeMatchData[i].Split(',');
+              PreviousMoves.Add((moveData[0], int.Parse(moveData[1])));
+            }
+          }
+
+          OnWatchGameAck?.Invoke();
+          break;
+        default:
+          GD.Print($"Unhandled GAME message: {body}");
+          break;
+      }
+    }
+  }
+
+  public void ShowTournamentScoreboard(List<(string, int)> playerScoreboard) {
+    var scoreboardWindow = new Window();
+    scoreboardWindow.Theme = GD.Load<Theme>("res://assets/theme.tres");
+    scoreboardWindow.AlwaysOnTop = true;
+    scoreboardWindow.MaximizeDisabled = true;
+    scoreboardWindow.Unresizable = true;
+    scoreboardWindow.InitialPosition = Window.WindowInitialPosition.CenterMainWindowScreen;
+    scoreboardWindow.Size = new Vector2I(256, 512);
+    scoreboardWindow.CloseRequested += () => { GetTree().Root.RemoveChild(scoreboardWindow); };
+
+    var tree = new Tree();
+    tree.HideRoot = true;
+    tree.Columns = 2;
+    tree.ColumnTitlesVisible = true;
+    tree.Theme = GD.Load<Theme>("res://assets/theme.tres");
+    tree.GrowHorizontal = Control.GrowDirection.Both;
+    tree.GrowVertical = Control.GrowDirection.Both;
+    tree.SetColumnTitle(0, "Player");
+    tree.SetColumnTitle(1, "Score");
+    var root = tree.CreateItem();
+
+    foreach ((string, int) entry in playerScoreboard) {
+      var item = tree.CreateItem(root);
+      item.SetText(0, entry.Item1);
+      item.SetText(1, entry.Item2.ToString());
+    }
+
+    scoreboardWindow.AddChild(tree);
+    tree.SetAnchorsPreset(Control.LayoutPreset.FullRect);
+
+    GetTree().Root.AddChild(scoreboardWindow);
+  }
+}
\ No newline at end of file
diff --git a/scripts/MatchData.cs b/scripts/MatchData.cs
index e055e2d..ab804de 100644
--- a/scripts/MatchData.cs
+++ b/scripts/MatchData.cs
@@ -1,13 +1,11 @@
-public class MatchData
-{
-    public int matchId { get; private set; }
-    public string player1 { get; private set; }
-    public string player2 { get; private set; }
+public class MatchData {
+  public int matchId { get; private set; }
+  public string player1 { get; private set; }
+  public string player2 { get; private set; }
 
-    public MatchData(int matchId, string player1, string player2)
-    {
-        this.matchId = matchId;
-        this.player1 = player1;
-        this.player2 = player2;
-    }
-}
+  public MatchData(int matchId, string player1, string player2) {
+    this.matchId = matchId;
+    this.player1 = player1;
+    this.player2 = player2;
+  }
+}
\ No newline at end of file
diff --git a/scripts/PlayerData.cs b/scripts/PlayerData.cs
index 369d358..df3fadd 100644
--- a/scripts/PlayerData.cs
+++ b/scripts/PlayerData.cs
@@ -1,13 +1,11 @@
-public class PlayerData
-{
-    public string username { get; private set; }
-    public bool isReady { get; private set; }
-    public bool isPlaying { get; private set; }
+public class PlayerData {
+  public string username { get; private set; }
+  public bool isReady { get; private set; }
+  public bool isPlaying { get; private set; }
 
-    public PlayerData(string username, bool isReady, bool isPlaying)
-    {
-        this.username = username;
-        this.isReady = isReady;
-        this.isPlaying = isPlaying;
-    }
+  public PlayerData(string username, bool isReady, bool isPlaying) {
+    this.username = username;
+    this.isReady = isReady;
+    this.isPlaying = isPlaying;
+  }
 }
\ No newline at end of file
diff --git a/scripts/TournamentType.cs b/scripts/TournamentType.cs
new file mode 100644
index 0000000..71e6773
--- /dev/null
+++ b/scripts/TournamentType.cs
@@ -0,0 +1,5 @@
+public enum TournamentType {
+  None,
+  RoundRobin
+}
+