diff --git a/grid_2048.py b/grid_2048.py
index ac01a73fb9c934a0013ebd83c45e7c65cfd7faa4..cd37e2d5e01bb1c6346b779a7161a2e0bf52c489 100644
--- a/grid_2048.py
+++ b/grid_2048.py
@@ -10,31 +10,56 @@ def create_grid(taille):
         grille.append(ligne.copy()) #permet de découpler les lignes
     return grille
 
-def add_new_tile_at_position(name_grid,ligne,pos_ligne,value):
+def add_new_tile(grid):
     #la position indiqué doit etre cohérente avec les dimensions de la grille considérée
-    name_grid[ligne][pos_ligne]=value
+    value=choose_value_new_tile()
+    (x,y)=get_new_position(grid)
+    grid[x][y]=value
     #attention, la fonction modifie la liste passée en argument !
-    return(name_grid)
+    return(grid)
 
-grid=create_grid(4)
-add_new_tile_at_position(grid,2,1,4)
-print(grid)
 
 def choose_value_new_tile():
     value=rd.choice([2,2,2,2,2,2,2,2,2,4])
     return(value)
 
-def get_all_tiles (name_grid):
-    nb_ligne=len(name_grid)
-    nb_colonne=len(name_grid[0]) #on suppose que la grille a au moins une ligne
+def get_all_tiles (grid):
+    nb_ligne=len(grid)
+    nb_colonne=len(grid[0]) #on suppose que la grille a au moins une ligne
     tiles=[]
     for ligne in range (nb_ligne):
         for colonne in range (nb_colonne):
-            tile = name_grid[ligne][colonne]
+            tile = grid[ligne][colonne]
             if tile == ' ':
                 tiles.append(0)
             else :
                 tiles.append(tile)
     return(tiles)
 
-print(get_all_tiles(grid))
+def get_empty_tile_position(grid):
+    position_empty=[]
+    for ligne in range (len(grid)):
+        for colonne in range (len(grid[0])):
+            if grid[ligne][colonne]==0 or grid[ligne][colonne]==' ' :
+                position_empty.append((ligne,colonne))
+    return(position_empty)
+
+def get_new_position (grid):
+    #choisi une postion au hasard parmis les position libre
+    position_empty=get_empty_tile_position(grid)
+    (x,y)=rd.choice(position_empty)
+    return((x,y))
+
+def grid_get_value(grid,x,y):
+    if grid[x][y] == ' ':
+        return (0)
+    else :
+        return(grid[x][y])
+
+def init_game(taille):
+    new_grid=create_grid(taille)
+    (x1,y1)=get_new_position(new_grid) #choisi la première tuile qui va être un 2 ou un 4
+    new_grid[x1][y1]=choose_value_new_tile()
+    (x2,y2)=get_new_position(new_grid) #choisi la deuxièeme tuile
+    new_grid[x2][y2]=choose_value_new_tile()
+    return(new_grid)
diff --git a/test_grid_2048.py b/test_grid_2048.py
index 96bd38006a16bcc61501b77674f9578bda5c7999..753a0c4361aeb5c74c619c1424aca45f604560fb 100644
--- a/test_grid_2048.py
+++ b/test_grid_2048.py
@@ -7,20 +7,50 @@ def test_create_grid():
     assert create_grid(1)==[[' ']]
     assert create_grid(2)==[[' ',' '],[' ',' ']]
 
-def test_add_new_tile_at_position():
+"""def test_add_new_tile_at_position():
     game_grid=create_grid(4)
-    assert add_new_tile_at_position(game_grid,1,1,2)==[[' ',' ',' ', ' '],[' ', 2 ,' ', ' '],[' ',' ',' ', ' '],[' ',' ',' ', ' ']]
+    assert add_new_tile(game_grid, 1, 1, 2) == [[' ', ' ', ' ', ' '], [' ', 2 , ' ', ' '], [' ', ' ', ' ', ' '], [' ', ' ', ' ', ' ']]
     game_grid=create_grid(4)
-    assert add_new_tile_at_position(game_grid,2,1,4)==[[' ', ' ', ' ', ' '], [' ', ' ', ' ', ' '], [' ', 4, ' ', ' '], [' ', ' ', ' ', ' ']]
+    assert add_new_tile(game_grid, 2, 1, 4) == [[' ', ' ', ' ', ' '], [' ', ' ', ' ', ' '], [' ', 4, ' ', ' '], [' ', ' ', ' ', ' ']]
     game_grid=create_grid(4)
-    assert add_new_tile_at_position(game_grid,3,0,2)==[[' ', ' ', ' ', ' '], [' ', ' ', ' ', ' '], [' ',' ', ' ', ' '], [2, ' ', ' ', ' ']]
+    assert add_new_tile(game_grid, 3, 0, 2) == [[' ', ' ', ' ', ' '], [' ', ' ', ' ', ' '], [' ', ' ', ' ', ' '], [2, ' ', ' ', ' ']]
     game_grid=create_grid(4)
     value=choose_value_new_tile()
-    game_grid=add_new_tile_at_position(game_grid,1,1,value)
+    game_grid=add_new_tile(game_grid, 1, 1, value)
     tiles=get_all_tiles(game_grid)
-    assert 2 or 4 in tiles
+    assert 2 or 4 in tiles """
+
 
+def test_choose_value_new_tile():
+    assert choose_value_new_tile()== 2 or 4
 
+def test_get_all_tiles():
+    assert get_all_tiles([[' ',4,4,6],[' ',' ',' ',8],[32,32,' ',64],[1024,' ',' ',512]])==[0,4,4,6,0,0,0,8,32,32,0,64,1024,0,0,512]
+    assert get_all_tiles([[16,4,8,2], [2,4,2,128], [4,512,32,64],[1024,2048,512,2]]) == [16, 4, 8, 2, 2, 4, 2, 128, 4, 512, 32, 64, 1024, 2048, 512,2]
 
+def test_get_empty_tile_position():
+    assert get_empty_tile_position([[0,0,16,32],[64,8,0,6],[64,0,4,8],[512,4,4,6]])==[(0,0),(0,1),(1,2),(2,1)]
+    assert get_empty_tile_position([[16,4,8,2], [2,4,2,128], [4,512,32,64],[1024,2048,512,2]])==[]
+    assert get_empty_tile_position([[' ', 16, 32, 0], [64, 0, 32, 2], [2, 2, 8,4], [512, 8, 16, 0]])==[(0,0),(0,3),(1,1),(3,3)]
+    assert get_empty_tile_position(create_grid(2))==[(0,0),(0,1),(1,0),(1,1)]
 
 
+def test_get_new_position():
+    grid = [[0, 16, 32, 0], [64, 0, 32, 2], [2, 2, 8, 4], [512, 8, 16, 0]]
+    x,y=get_new_position(grid)
+    assert(grid_get_value(grid,x,y)) == 0
+    grid = [[' ',4,8,2], [' ',' ',' ',' '], [' ',512,32,64], [1024,2048,512, ' ']]
+    x,y=get_new_position(grid)
+    assert(grid_get_value(grid,x,y)) == 0
+
+def test_add_new_tile():
+    game_grid=create_grid(4)
+    game_grid=add_new_tile(game_grid)
+    tiles = get_all_tiles(game_grid)
+    assert 2 or 4 in tiles
+
+def test_init_game():
+    grid = init_game(4)
+    tiles = get_all_tiles(grid)
+    assert 2 or 4 in tiles
+    assert len(get_empty_tile_position(grid)) == 14