diff --git a/WEB/Controller/PartieGateway.php b/WEB/Controller/PartieGateway.php
index 1ecac2e6..15ec341f 100644
--- a/WEB/Controller/PartieGateway.php
+++ b/WEB/Controller/PartieGateway.php
@@ -302,6 +302,20 @@ class PartieGateway
         }
         return $lesJoueurs;
     }
+
+    public function findAllEnigmeIdInPartie($idPartie){
+        $query = "SELECT * FROM Contenir WHERE partie = :idPartie";
+        $this->con->executeQuery($query, array(
+            "idPartie" => array($idPartie, SQLITE3_INTEGER)
+        )
+        );
+        $results = $this->con->getResults();
+        $lesEnigmes = array();
+        foreach ($results as $row){
+            $lesEnigmes[] = $row['enigme'];
+        }
+        return $lesEnigmes;
+    }
     public function showAll(): void
     {
         $query = "SELECT * FROM Partie";
diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php
index b6f587fb..bb5ba418 100644
--- a/WEB/Controller/UserController.php
+++ b/WEB/Controller/UserController.php
@@ -190,20 +190,33 @@ class UserController
             $lesJoueurs = $model->getLesJoueurs($idPartie);
             if($etat == 1){
                 // header("Location: index.php?action=launchGame");
-                header("Location: index.php?action=goToPresentation");
+                $this->goToGame($idPartie);
             }
             else{
                 while ($etat == 0){
                     sleep(5);
                     $etat = $model->getEtatPartie($idPartie);
                 }
-                header("Location: index.php?action=goToPresentation"); 
+                $this->goToGame($idPartie);
             }
         } catch (Exception $e) {
             $error = $e->getMessage();
             require($rep . $vues['erreur']);
         }
     }
+
+    public function goToGame($idPartie){
+        try {
+            global $rep, $vues, $error;
+            $model = new UserModel();
+            $utilisateur = $_SESSION['utilisateur'];
+            $enigme = $model->getEnigmebyPartieId($idPartie)[0];
+            require($rep . $vues['partie']);
+        } catch (Exception $e) {
+            $error = $e->getMessage();
+            require($rep . $vues['erreur']);
+        }
+    }
     public function launchGame(){
         try {
             global $rep, $vues, $error;
diff --git a/WEB/Model/UserModel.php b/WEB/Model/UserModel.php
index de336288..5ad85d1a 100644
--- a/WEB/Model/UserModel.php
+++ b/WEB/Model/UserModel.php
@@ -24,37 +24,6 @@ class UserModel
             require($rep . $view['erreur']);
         }
     }
-    // public function addToQueue()
-    // {
-    //     echo '1';
-    //     $utilisateur = $_SESSION['utilisateur'];
-    //     if ($this->utilisateur_gateway->isAlreadyInqueue($utilisateur)) {
-    //         var_dump($this->utilisateur_gateway->queueFilled());
-    //         if($this->utilisateur_gateway->queueFilled())
-    //         {
-    //             header('Location: index.php?action=launchGame');
-    //         }
-    //         return;
-    //     }
-    //     echo '2';
-    //     if (!$this->partie_gateway->partieInQueueExists()) {
-    //         echo '3';
-    //         $tabEnigme = $this->enigme_gateway->findMultiEnigma();
-    //         $idNewPartie = $this->partie_gateway->findPartieMaxId();
-    //         $partie = $this->partie_gateway->creerPartieMulti($idNewPartie, $tabEnigme);
-    //     } else {
-    //         echo '4';
-    //         $idPartieInQueue = $this->partie_gateway->findPartieInQueue();
-    //         echo '5';
-    //         $tabEnigme = $this->enigme_gateway->findEnigmaFromPartie($idPartieInQueue);
-    //         echo '6';
-    //         $partie = $this->partie_gateway->rejoindrePartieMulti($idPartieInQueue, $tabEnigme);
-    //         echo '7';
-    //     }
-    //     echo '8';
-    //     $this->utilisateur_gateway->addToQueue($utilisateur, $partie);
-    // }
-
     public function addToQueue($mailUtilisateur) : array{
         $idPartie=$this->partie_gateway->findPartieInQueue();
         if ($idPartie == 0){
@@ -153,4 +122,13 @@ class UserModel
         }
         return $lesJoueurs;
     }
+
+    public function getEnigmebyPartieId($idPartie){
+        $lesIdEnigmes = $this->partie_gateway->findAllEnigmeIdInPartie($idPartie);
+        $lesEnigmes = array();
+        foreach ($lesIdEnigmes as $id){
+            $lesEnigmes[] = $this->enigme_gateway->findById($id)[0];
+        }
+        return $lesEnigmes;
+    }
 }
\ No newline at end of file
diff --git a/WEB/View/src/pages/Multijoueur/Partie.php b/WEB/View/src/pages/Multijoueur/Partie.php
index 7dc3ebf1..cc267556 100644
--- a/WEB/View/src/pages/Multijoueur/Partie.php
+++ b/WEB/View/src/pages/Multijoueur/Partie.php
@@ -1,5 +1,175 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>
+    <?php
+      echo $enigme->getNom();
+    ?>
+  </title>
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/css/bootstrap.min.css"
+    integrity="sha384-r4NyP46KrjDleawBgD5tp8Y7UzmLA05oM1iAEQ17CSuDqnUK2+k9luXQOfXJCJ4I" crossorigin="anonymous" />
+  <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
+    integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo"
+    crossorigin="anonymous"></script>
+  <script src="https://stackpath.bootstrapcdn.com/bootstrap/5.0.0-alpha1/js/bootstrap.min.js"
+    integrity="sha384-oesi62hOLfzrys4LxRF63OJCXdXDipiYWBnvTl9Y9/TRlw5xlKIEHpNyvvDShgf/"
+    crossorigin="anonymous"></script>
+  <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
+  <link rel="stylesheet" href="View/src/CSS/Enigme.css" />
+</head>
+
 <body>
-vous êtes dans la partie
+  <div class="container-fluid px-5">
+    <!-- First Row -->
+    <div class="row py-4">
+      <div class="col-5 d-flex align-items-center px-0">
+        <a class="material-icons pl-0" id="home" href="index.php?action=goToHome"
+          style="font-size: 40px; color: white">home</a>
+      </div>
+      <div class="col-1 d-flex align-items-center justify-content-end px-0">
+        <a class="material-icons pl-0" id="backArrow" 
+          href="index.php?action=goToEnigme&ordre=<?php 
+          if ($enigme->getOrdre() == 1) 
+            { 
+              echo $enigme->getOrdre(); 
+            } 
+          else 
+            { 
+              echo $enigme->getOrdre() - 1; 
+            }?>"
+          style="font-size: 40px; color: white">< &nbsp;</a>
+      </div>
+      <div class="col-1 d-flex align-items-center px-0">
+        <a class="material-icons pl-0" id="nextArrow" 
+          href="index.php?action=goToEnigme&ordre=<?php echo $enigme->getOrdre() + 1; ?>"
+          style="font-size: 40px; color: white">&nbsp; ></a>
+      </div>
+      <button style="background-color: transparent; border: none; outline: none;" onclick="displayHelp()"
+        class="col-5 d-flex align-items-center">
+        <div class="col-10 text-right px-3">
+          <p style="font-size: 14px; color: white"><b>Besoin d'aide ?</b></p>
+        </div>
+        <div class="col-2 text-right">
+          <img src="View/assets/img/Foxy.png" alt="Logo" class="rounded-circle moving-fox"
+            style="border: 1px solid #44fff6; width: 60px; height: 60px" />
+        </div>
+      </button>
+    </div>
+    <!-- End First Row -->
+
+    <!-- Second Row -->
+    <div class="row">
+      <!-- First Column -->
+      <div class="col-3 rounded p-3" style="background-color: #222831; min-height: 80vh; height: auto">
+        <h2 class="text-left py-3" style="color: #44fff6; font-weight: 500">
+          <?php
+          echo $enigme->getNom();
+          ?>
+        </h2>
+        <p>
+          <?php
+          echo $enigme->getEnonce();
+          ?>
+        </p>
+        <h3 class="text-left pb-3 pt-5" style="color: #44fff6">Rappel</h3>
+        <p>
+          <?php
+          echo $enigme->getRappel();
+          ?>
+        </p>
+        <h3 class="text-left pb-3 pt-5" style="color: #44fff6">Exemple</h3>
+        <p>
+          <?php
+          echo $enigme->getExemple();
+          ?>
+        </p>
+        <h3 class="text-left pb-3 pt-5 help" style="color: #44fff6; display: none">Aide</h3>
+        <p style="display: none" class="help">
+          <?php
+          echo $enigme->getAide();
+          ?>
+        </p>
+      </div>
+      <!-- End First Column -->
+
+      <!-- Second Column -->
+      <div class="col-5 pr-0">
+        <div class="ace rounded" id="editor"><?php 
+        // echo $code;
+        if (! isset($code) || $code == ""){
+          echo $enigme->getPrompt();
+        }
+        else {
+          echo $code;}
+        ?></div>
+      </div>
+      <!-- End Second Column -->
+
+      <!-- Third Column -->
+      <div class="col-4">
+        <textarea id="console" readonly style="width: 100%; min-height: 65vh; height: auto"
+          class="p-3 rounded"></textarea>
+
+        <div class="row pt-5 text-center" style="cursor: pointer">
+          <div class="col-6">
+            <a onclick="run_init()" class="btn">
+              <span>Run</span>
+            </a>
+          </div>
+          <div class="col-6">
+            <button onclick="submit()" class="btn" data-toggle="modal" data-target="#modal">
+              <span>Submit</span>
+            </button>
+          </div>
+        </div>
+      </div>
+      <!-- End Third Column -->
+    </div>
+    <!-- End Second Row -->
+  </div>
+
+  <!-- Modal -->
+  <div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle"
+    aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h2 class="modal-title" id="exampleModalLongTitle" style="color: black">
+            Results
+          </h2>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body">
+          <h5 id="result" style="color: black"></h5>
+        </div>
+        <div class="modal-footer">
+          <a
+          <?php
+          echo 'href="index.php?';
+          ?>
+          class="btn" style="display: none" id="next"
+          >
+            <span>NEXT</span>
+          </a>
+        </div>
+      </div>
+    </div>
+  </div>
+  <!-- End Modal -->
+
+  <script src="https://ajaxorg.github.io/ace-builds/src-noconflict/ace.js" type="text/javascript"
+    charset="utf-8"></script>
+  <script src="https://raw.githack.com/pythonpad/brython-runner/master/lib/brython-runner.bundle.js"
+    type="text/javascript" charset="utf-8"></script>
+  <script src="View/src/JS/base.js"></script>
+  <?php
+  echo '<script src="View/src/JS/' . $enigme->getNom() . '.js"></script>';
+  ?>
 </body>
+
 </html>
\ No newline at end of file