diff --git a/.idea/copilotDiffState.xml b/.idea/copilotDiffState.xml
index e3a4679..40e10bf 100644
--- a/.idea/copilotDiffState.xml
+++ b/.idea/copilotDiffState.xml
@@ -20,6 +20,41 @@
             </PendingDiffInfo>
           </value>
         </entry>
+pantalla_emparejamiento
+        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Move.java">
+          <value>
+            <PendingDiffInfo>
+              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/model/Move.java" />
+              <option name="updatedContent" value="package es.iesquevedo.model;&#10;&#10;import java.util.UUID;&#10;&#10;/**&#10; * Representa un movimiento en una partida de Inazuma Go.&#10; */&#10;public class Move {&#10;    private String id;&#10;    private String playerId;&#10;    private int row;&#10;    private int col;&#10;    private boolean isPass; // true si es un pase, false si es colocar piedra&#10;    private long timestamp;&#10;    private int capturedCount; // número de piedras capturadas en este movimiento&#10;&#10;    public Move(String playerId, int row, int col) {&#10;        this.id = UUID.randomUUID().toString();&#10;        this.playerId = playerId;&#10;        this.row = row;&#10;        this.col = col;&#10;        this.isPass = false;&#10;        this.timestamp = System.currentTimeMillis();&#10;        this.capturedCount = 0;&#10;    }&#10;&#10;    public Move(String playerId, boolean isPass) {&#10;        this.id = UUID.randomUUID().toString();&#10;        this.playerId = playerId;&#10;        this.isPass = isPass;&#10;        this.timestamp = System.currentTimeMillis();&#10;        this.capturedCount = 0;&#10;        this.row = -1;&#10;        this.col = -1;&#10;    }&#10;&#10;    public String getId() {&#10;        return id;&#10;    }&#10;&#10;    public String getPlayerId() {&#10;        return playerId;&#10;    }&#10;&#10;    public int getRow() {&#10;        return row;&#10;    }&#10;&#10;    public int getCol() {&#10;        return col;&#10;    }&#10;&#10;    public boolean isPass() {&#10;        return isPass;&#10;    }&#10;&#10;    public long getTimestamp() {&#10;        return timestamp;&#10;    }&#10;&#10;    public int getCapturedCount() {&#10;        return capturedCount;&#10;    }&#10;&#10;    public void setCapturedCount(int count) {&#10;        this.capturedCount = count;&#10;    }&#10;&#10;    @Override&#10;    public String toString() {&#10;        if (isPass) {&#10;            return &quot;Move{&quot; + &quot;playerId='&quot; + playerId + '\'' + &quot;, PASS&quot; + &quot;, timestamp=&quot; + timestamp + '}';&#10;        }&#10;        return &quot;Move{&quot; + &quot;playerId='&quot; + playerId + '\'' + &quot;, row=&quot; + row + &quot;, col=&quot; + col + &quot;, timestamp=&quot; + timestamp + '}';&#10;    }&#10;}&#10;" />
+            </PendingDiffInfo>
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/MoveValidator.java">
+          <value>
+            <PendingDiffInfo>
+              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/MoveValidator.java" />
+              <option name="updatedContent" value="package es.iesquevedo.service;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.Move;&#10;&#10;/**&#10; * Interfaz para validar movimientos en una partida de Inazuma Go.&#10; */&#10;public interface MoveValidator {&#10;    /**&#10;     * Valida un movimiento en el contexto de una partida.&#10;     * &#10;     * @param game La partida actual&#10;     * @param move El movimiento a validar&#10;     * @throws InvalidMoveException si el movimiento es inválido&#10;     * @throws PlayerNotInTurnException si no es el turno del jugador&#10;     */&#10;    void validateMove(Game game, Move move) throws InvalidMoveException, PlayerNotInTurnException;&#10;}&#10;" />
+            </PendingDiffInfo>
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/impl/GameServiceImpl.java">
+          <value>
+            <PendingDiffInfo>
+              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/impl/GameServiceImpl.java" />
+              <option name="originalContent" value="package es.iesquevedo.service.impl;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.GameState;&#10;import es.iesquevedo.model.Player;&#10;import es.iesquevedo.service.GameService;&#10;&#10;import java.util.HashMap;&#10;import java.util.Map;&#10;&#10;/**&#10; * Implementación de GameService.&#10; * Gestiona la lógica de turnos y validaciones en memoria.&#10; */&#10;public class GameServiceImpl implements GameService {&#10;&#10;    // Almacenamiento en memoria (será reemplazado por repositorio en producción)&#10;    private final Map&lt;String, Game&gt; games = new HashMap&lt;&gt;();&#10;&#10;    @Override&#10;    public Game createGame(String gameName, Player player1) {&#10;        if (gameName == null || gameName.isEmpty()) {&#10;            throw new IllegalArgumentException(&quot;Nombre de partida no puede estar vacío&quot;);&#10;        }&#10;        if (player1 == null) {&#10;            throw new IllegalArgumentException(&quot;Jugador 1 no puede ser nulo&quot;);&#10;        }&#10;        &#10;        Game game = new Game(gameName, player1);&#10;        games.put(game.getId(), game);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game joinGame(String gameId, Player player2) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;        if (game.getState() != GameState.WAITING) {&#10;            throw new IllegalStateException(&quot;La partida no está en estado WAITING&quot;);&#10;        }&#10;        &#10;        game.addPlayer(player2);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game startGame(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;        &#10;        game.start();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game executeMove(String gameId, String playerId, Object moveData) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        // Validar que es turno del jugador&#10;        Player currentPlayer = game.getCurrentPlayer();&#10;        if (currentPlayer == null || !currentPlayer.getId().equals(playerId)) {&#10;            throw new PlayerNotInTurnException(&quot;No es el turno del jugador: &quot; + playerId);&#10;        }&#10;&#10;        // Validar que el jugador está vivo&#10;        if (!currentPlayer.isAlive()) {&#10;            throw new InvalidMoveException(&quot;El jugador no está vivo&quot;);&#10;        }&#10;&#10;        // Validar que la partida está en curso&#10;        if (game.getState() != GameState.IN_PROGRESS) {&#10;            throw new InvalidMoveException(&quot;La partida no está en curso&quot;);&#10;        }&#10;&#10;        // Aquí iría validación específica de reglas del juego&#10;        // Por ahora, aceptamos el movimiento passively&#10;        // (MOTOR completa con lógica real según reglamento)&#10;&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game nextTurn(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        if (game.getState() != GameState.IN_PROGRESS) {&#10;            throw new IllegalStateException(&quot;La partida no está en curso&quot;);&#10;        }&#10;&#10;        game.nextTurn();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game finishGame(String gameId, String winnerPlayerId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        game.finish(winnerPlayerId);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game abandonGame(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        game.abandon();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game getGame(String gameId) {&#10;        return games.get(gameId);&#10;    }&#10;&#10;    /**&#10;     * Método auxiliar para tests: resetea el almacenamiento en memoria.&#10;     */&#10;    public void reset() {&#10;        games.clear();&#10;    }&#10;}&#10;" />
+              <option name="updatedContent" value="package es.iesquevedo.service.impl;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Board;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.GameState;&#10;import es.iesquevedo.model.Move;&#10;import es.iesquevedo.model.Player;&#10;import es.iesquevedo.service.GameService;&#10;import es.iesquevedo.service.MoveValidator;&#10;&#10;import java.util.HashMap;&#10;import java.util.Map;&#10;&#10;/**&#10; * Implementación de GameService.&#10; * Gestiona la lógica de turnos y validaciones en memoria.&#10; */&#10;public class GameServiceImpl implements GameService {&#10;&#10;    // Almacenamiento en memoria (será reemplazado por repositorio en producción)&#10;    private final Map&lt;String, Game&gt; games = new HashMap&lt;&gt;();&#10;    private final MoveValidator moveValidator;&#10;&#10;    public GameServiceImpl() {&#10;        this.moveValidator = new InazumaGoMoveValidator();&#10;    }&#10;&#10;    public GameServiceImpl(MoveValidator moveValidator) {&#10;        this.moveValidator = moveValidator;&#10;    }&#10;&#10;    @Override&#10;    public Game createGame(String gameName, Player player1) {&#10;        if (gameName == null || gameName.isEmpty()) {&#10;            throw new IllegalArgumentException(&quot;Nombre de partida no puede estar vacío&quot;);&#10;        }&#10;        if (player1 == null) {&#10;            throw new IllegalArgumentException(&quot;Jugador 1 no puede ser nulo&quot;);&#10;        }&#10;        &#10;        Game game = new Game(gameName, player1);&#10;        games.put(game.getId(), game);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game joinGame(String gameId, Player player2) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;        if (game.getState() != GameState.WAITING) {&#10;            throw new IllegalStateException(&quot;La partida no está en estado WAITING&quot;);&#10;        }&#10;        &#10;        game.addPlayer(player2);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game startGame(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;        &#10;        game.start();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game executeMove(String gameId, String playerId, Object moveData) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        if (!(moveData instanceof Move)) {&#10;            throw new IllegalArgumentException(&quot;moveData debe ser instancia de Move&quot;);&#10;        }&#10;&#10;        Move move = (Move) moveData;&#10;&#10;        // Validar movimiento con reglas de Inazuma Go&#10;        moveValidator.validateMove(game, move);&#10;&#10;        // Guardar estado previo del tablero para detectar repetición&#10;        Board previousBoardState = game.getBoard().clone();&#10;&#10;        if (move.isPass()) {&#10;            // Registrar pase&#10;            game.getMoves().add(move);&#10;            game.incrementConsecutivePasses();&#10;&#10;            // Doble pase = fin de partida&#10;            if (game.getConsecutivePasses() &gt;= 2) {&#10;                game.setState(GameState.FINISHED);&#10;                // Determinar ganador por puntuación (simplificado)&#10;                determineWinner(game);&#10;                return game;&#10;            }&#10;        } else {&#10;            // Ejecutar movimiento: colocar piedra&#10;            int color = game.getCurrentPlayerIndex() == 0 ? 1 : 2; // 1=negro, 2=blanco&#10;            Board board = game.getBoard();&#10;            board.placeStone(move.getRow(), move.getCol(), color);&#10;&#10;            // Capturar grupos enemigos sin libertades&#10;            int capturedCount = board.captureGroupsWithoutLiberties();&#10;            move.setCapturedCount(capturedCount);&#10;&#10;            // Registrar movimiento&#10;            game.getMoves().add(move);&#10;&#10;            // Reiniciar contador de pases si hubo captura&#10;            if (capturedCount &gt; 0) {&#10;                game.resetConsecutivePasses();&#10;            } else {&#10;                game.resetConsecutivePasses(); // También reinicia con colocación normal&#10;            }&#10;&#10;            // Detectar repetición: si el tablero es igual al estado previo, fin de partida&#10;            if (game.getLastBoardState() != null &amp;&amp; game.getLastBoardState().equals(board)) {&#10;                game.setState(GameState.FINISHED);&#10;                determineWinner(game);&#10;                return game;&#10;            }&#10;        }&#10;&#10;        // Guardar estado actual como &quot;último estado&quot; para próxima comparación&#10;        game.setLastBoardState(previousBoardState);&#10;&#10;        // Cambiar turno&#10;        game.nextTurn();&#10;&#10;        return game;&#10;    }&#10;&#10;    /**&#10;     * Determina el ganador de acuerdo a la puntuación simplificada.&#10;     * (En versión completa, implementar algoritmo de conteo según reglamento)&#10;     */&#10;    private void determineWinner(Game game) {&#10;        // Versión simplificada: cuenta piedras en el tablero&#10;        // TODO: Implementar conteo completo según reglamento (libertades, territorio, komi, etc.)&#10;        int blackStones = 0;&#10;        int whiteStones = 0;&#10;&#10;        Board board = game.getBoard();&#10;        for (int r = 0; r &lt; 9; r++) {&#10;            for (int c = 0; c &lt; 9; c++) {&#10;                if (board.getCell(r, c) == 1) blackStones++;&#10;                else if (board.getCell(r, c) == 2) whiteStones++;&#10;            }&#10;        }&#10;&#10;        // Komi de 5.5 para Blanco&#10;        double blackScore = blackStones;&#10;        double whiteScore = whiteStones + 5.5;&#10;&#10;        if (blackScore &gt; whiteScore) {&#10;            game.setWinnerPlayerId(game.getPlayers().get(0).getId());&#10;        } else {&#10;            game.setWinnerPlayerId(game.getPlayers().get(1).getId());&#10;        }&#10;    }&#10;&#10;    @Override&#10;    public Game nextTurn(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        if (game.getState() != GameState.IN_PROGRESS) {&#10;            throw new IllegalStateException(&quot;La partida no está en curso&quot;);&#10;        }&#10;&#10;        game.nextTurn();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game finishGame(String gameId, String winnerPlayerId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        game.finish(winnerPlayerId);&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game abandonGame(String gameId) {&#10;        Game game = getGame(gameId);&#10;        if (game == null) {&#10;            throw new IllegalArgumentException(&quot;Partida no encontrada: &quot; + gameId);&#10;        }&#10;&#10;        game.abandon();&#10;        return game;&#10;    }&#10;&#10;    @Override&#10;    public Game getGame(String gameId) {&#10;        return games.get(gameId);&#10;    }&#10;&#10;    /**&#10;     * Método auxiliar para tests: resetea el almacenamiento en memoria.&#10;     */&#10;    public void reset() {&#10;        games.clear();&#10;    }&#10;}&#10;" />
+            </PendingDiffInfo>
+          </value>
+        </entry>
+        <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/impl/InazumaGoMoveValidator.java">
+          <value>
+            <PendingDiffInfo>
+              <option name="filePath" value="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/impl/InazumaGoMoveValidator.java" />
+              <option name="updatedContent" value="package es.iesquevedo.service.impl;&#10;&#10;import es.iesquevedo.exception.InvalidMoveException;&#10;import es.iesquevedo.exception.PlayerNotInTurnException;&#10;import es.iesquevedo.model.Board;&#10;import es.iesquevedo.model.Game;&#10;import es.iesquevedo.model.GameState;&#10;import es.iesquevedo.model.Move;&#10;import es.iesquevedo.model.Player;&#10;import es.iesquevedo.service.MoveValidator;&#10;&#10;/**&#10; * Validador de movimientos para Inazuma Go.&#10; * Implementa las reglas del juego: turno, posición, libertades, suicidio, etc.&#10; */&#10;public class InazumaGoMoveValidator implements MoveValidator {&#10;&#10;    @Override&#10;    public void validateMove(Game game, Move move) throws InvalidMoveException, PlayerNotInTurnException {&#10;        // Verificar que la partida está en progreso&#10;        if (game.getState() != GameState.IN_PROGRESS) {&#10;            throw new InvalidMoveException(&quot;La partida no está en progreso&quot;);&#10;        }&#10;&#10;        // Verificar que es el turno del jugador&#10;        Player currentPlayer = game.getCurrentPlayer();&#10;        if (currentPlayer == null || !currentPlayer.getId().equals(move.getPlayerId())) {&#10;            throw new PlayerNotInTurnException(&quot;No es el turno del jugador: &quot; + move.getPlayerId());&#10;        }&#10;&#10;        // Verificar que el jugador está vivo&#10;        if (!currentPlayer.isAlive()) {&#10;            throw new InvalidMoveException(&quot;El jugador no está vivo&quot;);&#10;        }&#10;&#10;        // Si es un pase, es válido&#10;        if (move.isPass()) {&#10;            return;&#10;        }&#10;&#10;        // Validar posición&#10;        if (move.getRow() &lt; 0 || move.getRow() &gt;= 9 || move.getCol() &lt; 0 || move.getCol() &gt;= 9) {&#10;            throw new InvalidMoveException(&quot;Posición fuera del tablero: (&quot; + move.getRow() + &quot;,&quot; + move.getCol() + &quot;)&quot;);&#10;        }&#10;&#10;        // La posición debe estar vacía&#10;        Board board = game.getBoard();&#10;        if (!board.isEmpty(move.getRow(), move.getCol())) {&#10;            throw new InvalidMoveException(&quot;La posición ya está ocupada: (&quot; + move.getRow() + &quot;,&quot; + move.getCol() + &quot;)&quot;);&#10;        }&#10;&#10;        // Validar que el movimiento no es suicidio&#10;        validateNotSuicide(board, move, game);&#10;    }&#10;&#10;    /**&#10;     * Valida que el movimiento no deja el grupo sin libertades (suicidio).&#10;     * Un movimiento es suicidio si:&#10;     * - Coloca una piedra que quedaría sin libertades&#10;     * - Y no captura piedras enemigas que restauren libertades&#10;     */&#10;    private void validateNotSuicide(Board board, Move move, Game game) throws InvalidMoveException {&#10;        Board testBoard = board.clone();&#10;&#10;        // Colocar la piedra (color: 1 para jugador 0, 2 para jugador 1)&#10;        int color = game.getCurrentPlayerIndex() == 0 ? 1 : 2;&#10;        testBoard.placeStone(move.getRow(), move.getCol(), color);&#10;&#10;        // Capturar grupos enemigos sin libertades&#10;        testBoard.captureGroupsWithoutLiberties();&#10;&#10;        // Si el grupo del jugador sigue sin libertades, es suicidio&#10;        if (testBoard.countLibertiesForGroup(move.getRow(), move.getCol()) == 0) {&#10;            throw new InvalidMoveException(&quot;Movimiento es suicidio: la piedra quedaría sin libertades&quot;);&#10;        }&#10;    }&#10;}&#10;&#10;" />
+            </PendingDiffInfo>
+          </value>
+        </entry>
+
         <entry key="$PROJECT_DIR$/src/main/java/es/iesquevedo/service/impl/MainServiceImpl.java">
           <value>
             <PendingDiffInfo>
diff --git a/src/main/java/es/iesquevedo/controller/GameController.java b/src/main/java/es/iesquevedo/controller/GameController.java
index 24b1b19..bb92515 100644
--- a/src/main/java/es/iesquevedo/controller/GameController.java
+++ b/src/main/java/es/iesquevedo/controller/GameController.java
@@ -312,6 +312,13 @@ private void onBoardClick(MouseEvent event) {
         }
     }
 
+    public void initGame(String gameId, String playerName) {
+        this.player1Name = playerName + " (Negro)";
+        this.player2Name = "Oponente (Blanco)";
+        updatePlayerInfo();
+        LOGGER.log(Level.INFO, "Partida iniciada - GameID: " + gameId + " - Jugador: " + playerName);
+    }
+
     private boolean isValidPosition(int row, int col) {
         return row >= 0 && row < BOARD_SIZE && col >= 0 && col < BOARD_SIZE;
     }
diff --git a/src/main/java/es/iesquevedo/ui/MatchingScreenController.java b/src/main/java/es/iesquevedo/ui/MatchingScreenController.java
new file mode 100644
index 0000000..9bdb5bf
--- /dev/null
+++ b/src/main/java/es/iesquevedo/ui/MatchingScreenController.java
@@ -0,0 +1,159 @@
+package es.iesquevedo.ui;
+
+import es.iesquevedo.controller.GameController;
+import es.iesquevedo.model.Game;
+import es.iesquevedo.model.Player;
+import es.iesquevedo.service.GameService;
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class MatchingScreenController {
+
+    private static final Logger LOGGER = Logger.getLogger(MatchingScreenController.class.getName());
+
+    @FXML
+    private Label statusLabel;
+
+    @FXML
+    private Label timeLabel;
+
+    @FXML
+    private Button cancelButton;
+
+    private GameService gameService;
+    private Player currentPlayer;
+    private Timer timer;
+    private int elapsedSeconds = 0;
+    private CompletableFuture<Game> currentSearch;
+    private volatile boolean searching = true;
+
+    public void setGameService(GameService gameService) {
+        this.gameService = gameService;
+    }
+
+    public void startMatching(Player player) {
+        this.currentPlayer = player;
+        startTimer();
+        startSearch();
+    }
+
+    private void startTimer() {
+        timer = new Timer(true);
+        timer.scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                Platform.runLater(() -> {
+                    elapsedSeconds++;
+                    timeLabel.setText("Tiempo de espera: " + elapsedSeconds + "s");
+                });
+            }
+        }, 1000, 1000);
+    }
+
+    private void startSearch() {
+        statusLabel.setText("Buscando jugador disponible...");
+
+        currentSearch = CompletableFuture.supplyAsync(() -> {
+            try {
+                int waitTime = 3000 + (int)(Math.random() * 5000);
+                Thread.sleep(waitTime);
+                if (!searching) return null;
+
+                String gameName = "Partida_" + System.currentTimeMillis();
+                return gameService.createGame(gameName, currentPlayer);
+            } catch (Exception e) {
+                LOGGER.log(Level.WARNING, "Search interrupted", e);
+                return null;
+            }
+        });
+
+        currentSearch.thenAccept(game -> {
+            if (game != null && searching) {
+                Platform.runLater(() -> {
+                    stopTimer();
+                    statusLabel.setText("¡Oponente encontrado!");
+                    navigateToGame(game.getId());
+                });
+            }
+        }).exceptionally(ex -> {
+            Platform.runLater(() -> {
+                if (searching) {
+                    statusLabel.setText("Error en la búsqueda. Intenta de nuevo.");
+                    cancelButton.setText("Volver");
+                }
+            });
+            return null;
+        });
+    }
+
+    private void navigateToGame(String gameId) {
+        try {
+            searching = false;
+            if (currentSearch != null) {
+                currentSearch.cancel(true);
+            }
+
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/Game.fxml"));
+            Parent root = loader.load();
+
+            GameController gameController = loader.getController();
+            String playerName = currentPlayer != null ? currentPlayer.getName() : "Jugador";
+            gameController.initGame(gameId, playerName);
+
+            Stage stage = (Stage) cancelButton.getScene().getWindow();
+            stage.setScene(new Scene(root, 900, 700));
+            stage.setTitle("InazumaGo - Partida: " + gameId);
+            stage.show();
+
+        } catch (IOException e) {
+            LOGGER.log(Level.SEVERE, "Error loading game screen", e);
+            statusLabel.setText("Error al cargar la partida");
+        }
+    }
+
+    @FXML
+    private void onCancel() {
+        searching = false;
+        if (currentSearch != null) {
+            currentSearch.cancel(true);
+        }
+        stopTimer();
+        goBackToMainMenu();
+    }
+
+    private void goBackToMainMenu() {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/MainScreen.fxml"));
+            Parent root = loader.load();
+
+            // Just load the main screen - no additional setup needed
+            Stage stage = (Stage) cancelButton.getScene().getWindow();
+            stage.setScene(new Scene(root, 700, 500));
+            stage.setTitle("InazumaGo - Pantalla Principal");
+            stage.show();
+
+        } catch (IOException e) {
+            LOGGER.log(Level.SEVERE, "Error returning to main menu", e);
+        }
+    }
+
+    private void stopTimer() {
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/fxml/MatchingScreen.fxml b/src/main/resources/fxml/MatchingScreen.fxml
new file mode 100644
index 0000000..0b88457
--- /dev/null
+++ b/src/main/resources/fxml/MatchingScreen.fxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<VBox xmlns="http://javafx.com/javafx/21"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="es.iesquevedo.ui.MatchingScreenController"
+      spacing="20"
+      alignment="CENTER"
+      padding="20">
+
+    <Label text="Buscando oponente..." style="-fx-font-size: 24px; -fx-font-weight: bold;"/>
+
+    <ProgressIndicator/>
+
+    <Label fx:id="statusLabel" text="Buscando jugador disponible..." style="-fx-font-size: 14px;"/>
+
+    <Label fx:id="timeLabel" text="Tiempo de espera: 0s" style="-fx-font-size: 12px; -fx-text-fill: gray;"/>
+
+    <HBox spacing="20" alignment="CENTER">
+        <Button fx:id="cancelButton" text="Cancelar" onAction="#onCancel" style="-fx-background-color: #ff4444; -fx-text-fill: white;"/>
+    </HBox>
+
+</VBox>
\ No newline at end of file