diff --git a/code/.idea/misc.xml b/code/.idea/misc.xml
index 09731a8..fd3ea66 100644
--- a/code/.idea/misc.xml
+++ b/code/.idea/misc.xml
@@ -22,4 +22,4 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/arbitre/Arbitre.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/arbitre/Arbitre.java
index a2a32f0..1395b28 100644
--- a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/arbitre/Arbitre.java
+++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/arbitre/Arbitre.java
@@ -52,4 +52,9 @@ public abstract class Arbitre {
 	 * @see CellState
 	 */
 	public abstract CellState verifierChangementCellules(int x, int y, CellulesVivantes reference);
+
+	public void setPlateau (Plateau plateau){
+		this.plateau = plateau;
+	}
+
 }
diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/arbitre/ArbitreConwayStyle.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/arbitre/ArbitreConwayStyle.java
index e334dd0..5bf63c8 100644
--- a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/arbitre/ArbitreConwayStyle.java
+++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/arbitre/ArbitreConwayStyle.java
@@ -66,4 +66,6 @@ public class ArbitreConwayStyle extends Arbitre{
 		}
 		return false;
 	}
+
+
 }
diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/boucleDeJeu/observer/ObserverBDJ.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/boucleDeJeu/observer/ObserverBDJ.java
index 45d8de7..3f75889 100644
--- a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/boucleDeJeu/observer/ObserverBDJ.java
+++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/boucleDeJeu/observer/ObserverBDJ.java
@@ -1,11 +1,13 @@
 package projet.iut.jeu_de_la_vie.model.boucleDeJeu.observer;
 
+import java.io.Serializable;
+
 /**
  * Permet d'obbserver une boucle de jeu
  * @author Yohann Breuil
  * @author Allan Point
  */
-public interface ObserverBDJ {
+public interface ObserverBDJ extends Serializable {
 	/**
 	 * Réaction en cas de notification
 	 */
diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/plateau/PrototypePlateau.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/plateau/PrototypePlateau.java
index 79292bc..5d2bbcf 100644
--- a/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/plateau/PrototypePlateau.java
+++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/model/plateau/PrototypePlateau.java
@@ -1,10 +1,12 @@
 package projet.iut.jeu_de_la_vie.model.plateau;
 
+import java.io.Serializable;
+
 /**
  * Abstraction du clonnage de plateau
  * @author Yohann Breuil
  * @author Allan Point
  */
-public interface PrototypePlateau {
+public interface PrototypePlateau{
 	Plateau cloner();
 }
diff --git a/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java b/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java
index 7e1c2f5..d3b1efc 100644
--- a/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java
+++ b/code/app/src/main/java/projet/iut/jeu_de_la_vie/view/LauncherActivity.java
@@ -1,23 +1,29 @@
 package projet.iut.jeu_de_la_vie.view;
 
 import android.content.Intent;
+import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.Editable;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 
+import java.awt.font.NumericShaper;
 import java.util.List;
 
 import projet.iut.jeu_de_la_vie.R;
 import projet.iut.jeu_de_la_vie.model.Manager;
 import projet.iut.jeu_de_la_vie.model.cellule.Cellule;
+import projet.iut.jeu_de_la_vie.model.plateau.Plateau;
 
 public class LauncherActivity extends AppCompatActivity {
 
@@ -39,27 +45,34 @@ public class LauncherActivity extends AppCompatActivity {
         start = findViewById(R.id.startButton);
         start.setOnClickListener(this::startGame);
         /*
+        //manager.lancerJeu();
         start.setOnClickListener(l -> {
             EditText colones = findViewById(R.id.nbColone);
-            manager.getActualiseurCellule().getArbitre().getPlateau().setColone(Integer.parseInt(colones.getText().toString()));
+            //manager.getActualiseurCellule().getArbitre().getPlateau().setColone(Integer.parseInt(colones.getText().toString()));
             EditText lignes = findViewById(R.id.nbLignes);
-            manager.getActualiseurCellule().getArbitre().getPlateau().setLigne(Integer.parseInt(lignes.getText().toString()));
+            //manager.getActualiseurCellule().getArbitre().getPlateau().setLigne(Integer.parseInt(lignes.getText().toString()));
             for (List<Cellule> list : manager.getActualiseurCellule().getArbitre().getPlateau().getGrille()) {
                 for (Cellule cell :  list) {
                     Log.d("instances",cell.isAlive().toString());
                 }
             }
+
+             //updateGame();
+        });
+        findViewById(R.id.test).setOnClickListener(y -> {
+            manager.getActualiseurCellule().getArbitre().getPlateau().setColone(2);
+            manager.getActualiseurCellule().getArbitre().getPlateau().setLigne(2);
+            manager.getActualiseurCellule().getArbitre().getPlateau().getCell(1, 1).setAlive(true);
         });
          */
     }
 
-    @Override
-    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-        manager.getActualiseurCellule().getArbitre().getPlateau().setColone(savedInstanceState.getInt("colonnes"));
-        manager.getActualiseurCellule().getArbitre().getPlateau().setLigne(savedInstanceState.getInt("lignes"));
+    public void updateGame (){
+
     }
 
+
+
     @Override
     protected void onStop() {
 
@@ -106,9 +119,13 @@ public class LauncherActivity extends AppCompatActivity {
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         super.onSaveInstanceState(outState);
-        int colonnes = manager.getActualiseurCellule().getArbitre().getPlateau().getColone();
-        outState.putInt("colonnes",colonnes);
-        int lignes = manager.getActualiseurCellule().getArbitre().getPlateau().getLigne();
-        outState.putInt("lignes",lignes);
+        outState.putSerializable("manager",manager);
     }
+
+    @Override
+    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        manager = (Manager) savedInstanceState.getSerializable("manager");
+    }
+
 }
diff --git a/code/app/src/main/res/layout/jeu_de_la_vie.xml b/code/app/src/main/res/layout/jeu_de_la_vie.xml
new file mode 100644
index 0000000..bd094c5
--- /dev/null
+++ b/code/app/src/main/res/layout/jeu_de_la_vie.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <CheckBox
+        android:id="@+id/checkBox35"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox31"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox32" />
+
+    <CheckBox
+        android:id="@+id/checkBox36"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox35"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox33" />
+
+    <CheckBox
+        android:id="@+id/checkBox37"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox36"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox34" />
+
+    <CheckBox
+        android:id="@+id/checkBox5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox8"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/checkBox7"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox4" />
+
+    <CheckBox
+        android:id="@+id/checkBox8"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox3"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/checkBox9"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox7"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox" />
+
+    <CheckBox
+        android:id="@+id/checkBox10"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox9"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox2" />
+
+    <CheckBox
+        android:id="@+id/checkBox11"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox10"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox3" />
+
+    <CheckBox
+        android:id="@+id/checkBox12"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox11"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox8" />
+
+    <CheckBox
+        android:id="@+id/checkBox13"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox12"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox5" />
+
+    <CheckBox
+        android:id="@+id/checkBox14"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox7" />
+
+    <CheckBox
+        android:id="@+id/checkBox15"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox14"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox9" />
+
+    <CheckBox
+        android:id="@+id/checkBox16"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox15"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox10" />
+
+    <CheckBox
+        android:id="@+id/checkBox17"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox16"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox11" />
+
+    <CheckBox
+        android:id="@+id/checkBox18"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox17"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox12" />
+
+    <CheckBox
+        android:id="@+id/checkBox19"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox18"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox13" />
+
+    <CheckBox
+        android:id="@+id/checkBox20"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox14" />
+
+    <CheckBox
+        android:id="@+id/checkBox21"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox20"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox15" />
+
+    <CheckBox
+        android:id="@+id/checkBox22"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox21"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox16" />
+
+    <CheckBox
+        android:id="@+id/checkBox23"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox22"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox17" />
+
+    <CheckBox
+        android:id="@+id/checkBox24"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox23"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox18" />
+
+    <CheckBox
+        android:id="@+id/checkBox25"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox24"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox19" />
+
+    <CheckBox
+        android:id="@+id/checkBox26"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox20" />
+
+    <CheckBox
+        android:id="@+id/checkBox27"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox26" />
+
+    <CheckBox
+        android:id="@+id/checkBox28"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox26"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox21" />
+
+    <CheckBox
+        android:id="@+id/checkBox29"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox28"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox22" />
+
+    <CheckBox
+        android:id="@+id/checkBox30"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox27"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox28" />
+
+    <CheckBox
+        android:id="@+id/checkBox31"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox30"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox29" />
+
+    <CheckBox
+        android:id="@+id/checkBox32"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox29"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox23" />
+
+    <CheckBox
+        android:id="@+id/checkBox33"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox32"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox24" />
+
+    <CheckBox
+        android:id="@+id/checkBox34"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox33"
+        app:layout_constraintTop_toBottomOf="@+id/checkBox25" />
+
+    <CheckBox
+        android:id="@+id/checkBox4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/checkBox3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox2"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/checkBox2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <CheckBox
+        android:id="@+id/checkBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toEndOf="@+id/checkBox4"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/button3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="quitter"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/code/app/src/main/res/layout/menu_principal.xml b/code/app/src/main/res/layout/menu_principal.xml
index d28c482..bd13a66 100644
--- a/code/app/src/main/res/layout/menu_principal.xml
+++ b/code/app/src/main/res/layout/menu_principal.xml
@@ -120,4 +120,12 @@
         app:layout_constraintStart_toStartOf="@+id/nbColoneLabel"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/test"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="test"
+        app:layout_constraintBottom_toTopOf="@+id/startButton"
+        tools:layout_editor_absoluteX="88dp" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/code/app/src/main/res/layout/vue_jeu.xml b/code/app/src/main/res/layout/vue_jeu.xml
deleted file mode 100644
index 36bbf0e..0000000
--- a/code/app/src/main/res/layout/vue_jeu.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/board"
-        android:layout_width="409dp"
-        android:layout_height="729dp"
-        app:layout_constraintBottom_toTopOf="@+id/button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Button"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Button
-        android:id="@+id/button2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Button"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/button" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file