diff --git a/app/src/androidTest/java/ch/sdp/vibester/PartyRoomTest.kt b/app/src/androidTest/java/ch/sdp/vibester/PartyRoomTest.kt
index c54f8802e..ad2489de2 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/PartyRoomTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/PartyRoomTest.kt
@@ -6,16 +6,6 @@ import junit.framework.Assert.assertTrue
 import org.junit.Test
 
 class PartyRoomTest {
-    @Test
-    fun correctSetRoom() {
-        val roomName = "testRoom"
-        val testPartyRoom = PartyRoom()
-
-        testPartyRoom.setRoomName(roomName)
-
-        assertEquals(testPartyRoom.getRoomName(), roomName)
-    }
-
     @Test
     fun correctSetEmailList() {
         val emailList = mutableListOf("email1, email2")
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
index cafae8e9b..c95d6337b 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/ChoosePartyRoomActivityTest.kt
@@ -1,5 +1,7 @@
 package ch.sdp.vibester.activity
 
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
@@ -9,6 +11,7 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.helper.PartyRoom
 import ch.sdp.vibester.user.User
@@ -43,13 +46,20 @@ class ChoosePartyRoomActivityTest {
     val mockUsersRepo = mockk<DataGetter>()
 
     private fun createMockInvocation(partyRoom: PartyRoom) {
-        every {mockUsersRepo.createRoom(any(), any())} answers {
-            lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
+        every { mockUsersRepo.createRoom(any()) } answers {
+            firstArg<(PartyRoom, String) -> Unit>().invoke(partyRoom, "")
         }
 
-        every {mockUsersRepo.getRoomData(any(), any())} answers {
-            lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
+
+        every { mockUsersRepo.readStartGame(any(), any()) } answers {
+            false
         }
+
+        every { mockUsersRepo.updateRoomField<Boolean>(any(), any(), any()) } answers {}
+        every { mockUsersRepo.updateRoomField<MutableList<Pair<String, String>>>(any(), any(), any()) } answers {}
+
+        every { mockUsersRepo.getRoomData(any(), any(), any()) } answers {}
+
     }
 
     @After
@@ -59,6 +69,8 @@ class ChoosePartyRoomActivityTest {
 
     @Test
     fun correctJoinPartyIntent() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
         val roomName = "testRoomName"
         var mockUserEmailList = mutableListOf<String>("email1, email2")
         var mockPartyRoom = PartyRoom()
@@ -67,6 +79,10 @@ class ChoosePartyRoomActivityTest {
 
         createMockInvocation(mockPartyRoom)
 
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
         onView(ViewMatchers.withId(R.id.roomNameInput)).perform(
             ViewActions.typeText("testRoomName"),
             ViewActions.closeSoftKeyboard()
@@ -74,12 +90,14 @@ class ChoosePartyRoomActivityTest {
         onView(ViewMatchers.withId(R.id.joinParty)).perform(ViewActions.click())
 
         Intents.intended(IntentMatchers.hasComponent(PartyRoomActivity ::class.java.name))
-        Intents.intended(IntentMatchers.hasExtra("roomName", roomName))
+        Intents.intended(IntentMatchers.hasExtra("roomID", roomName))
         Intents.intended(IntentMatchers.hasExtra("createRoom", false))
     }
 
     @Test
     fun correctCreatePartyIntent() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
         val roomName = "testRoomName"
         var mockUserEmailList = mutableListOf<String>("email1, email2")
         var mockPartyRoom = PartyRoom()
@@ -88,6 +106,10 @@ class ChoosePartyRoomActivityTest {
 
         createMockInvocation(mockPartyRoom)
 
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
         onView(ViewMatchers.withId(R.id.roomNameInput)).perform(
             ViewActions.typeText("testRoomName"),
             ViewActions.closeSoftKeyboard()
@@ -95,7 +117,7 @@ class ChoosePartyRoomActivityTest {
         onView(ViewMatchers.withId(R.id.createParty)).perform(ViewActions.click())
 
         Intents.intended(IntentMatchers.hasComponent(PartyRoomActivity ::class.java.name))
-        Intents.intended(IntentMatchers.hasExtra("roomName", roomName))
+        Intents.intended(IntentMatchers.hasExtra("roomID", roomName))
         Intents.intended(IntentMatchers.hasExtra("createRoom", true))
     }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
index f59de9619..4aa8c7cfc 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/PartyRoomActivityTest.kt
@@ -1,19 +1,22 @@
 package ch.sdp.vibester.activity
 
-/*
+
+import android.content.Context
 import android.content.Intent
-import android.provider.Telephony
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions
 import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
 import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import ch.sdp.vibester.R
+import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.database.DataGetter
+import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.PartyRoom
-import ch.sdp.vibester.user.User
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -42,64 +45,143 @@ class PartyRoomActivityTest {
     @JvmField
     val mockUsersRepo = mockk<DataGetter>()
 
-    private fun createMockInvocation(partyRoom: PartyRoom) {
-        every {mockUsersRepo.createRoom(any(), any())} answers {
-            lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
+    private fun createMockInvocation(partyRoom: PartyRoom, songList: MutableList<Pair<String, String>>, startGame: Boolean, roomID: String) {
+        every {mockUsersRepo.createRoom(any())} answers {
+            firstArg<(PartyRoom, String) -> Unit>().invoke(partyRoom, roomID)
+        }
+
+        every { mockUsersRepo.getRoomData(any(), any(), any()) } answers {
+            secondArg<(PartyRoom, String) -> Unit>().invoke(partyRoom, roomID)
+            lastArg<(MutableList<Pair<String, String>>) -> Unit>().invoke(songList)
         }
 
-        every {mockUsersRepo.getRoomData(any(), any())} answers {
-            lastArg<(PartyRoom) -> Unit>().invoke(partyRoom)
+        every { mockUsersRepo.readStartGame(any(), any()) } answers {
+            secondArg<(Boolean) -> Unit>().invoke(startGame)
         }
+
+        every { mockUsersRepo.updateRoomField<Boolean>(any(), any(), any()) } answers {}
+        every { mockUsersRepo.updateRoomField<MutableList<Pair<String, String>>>(any(), any(), any()) } answers {}
+
+
     }
 
     @After
     fun clean() {
         Intents.release()
     }
-/*
+
     @Test
     fun correctCreation() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
         var mockRoomName = "mockName"
-        var mockUserEmailList = mutableListOf<String>("email1, email2")
+        var mockUserEmailList = mutableListOf<String>("Email1", "Email2")
+        var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
         var mockPartyRoom = PartyRoom()
 
         mockPartyRoom.setEmailList(mockUserEmailList)
 
-        createMockInvocation(mockPartyRoom)
+        createMockInvocation(mockPartyRoom, mockSongList, false, mockRoomName)
 
-        val intent = Intent(ApplicationProvider.getApplicationContext(), PartyRoomActivity::class.java)
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
+
+        val intent = Intent(ctx, PartyRoomActivity::class.java)
         intent.putExtra("roomName", mockRoomName)
         intent.putExtra("createRoom", true)
 
-        val scn: ActivityScenario<CreateProfileActivity> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<PartyRoomActivity> = ActivityScenario.launch(intent)
 
         Espresso.onView(ViewMatchers.withId(R.id.emails))
             .check(ViewAssertions.matches(ViewMatchers.withText(mockUserEmailList.toString())))
     }
 
- */
-/*
     @Test
     fun correctJoin() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
         var mockRoomName = "mockName"
         var mockUserEmailList = mutableListOf<String>("email1, email2")
+        var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
         var mockPartyRoom = PartyRoom()
 
         mockPartyRoom.setEmailList(mockUserEmailList)
 
-        createMockInvocation(mockPartyRoom)
+        createMockInvocation(mockPartyRoom, mockSongList, false, mockRoomName)
 
-        val intent = Intent(ApplicationProvider.getApplicationContext(), PartyRoomActivity::class.java)
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
+        val intent = Intent(ctx, PartyRoomActivity::class.java)
         intent.putExtra("roomName", mockRoomName)
         intent.putExtra("createRoom", false)
 
-        val scn: ActivityScenario<CreateProfileActivity> = ActivityScenario.launch(intent)
+        val scn: ActivityScenario<PartyRoomActivity> = ActivityScenario.launch(intent)
 
         Espresso.onView(ViewMatchers.withId(R.id.emails))
             .check(ViewAssertions.matches(ViewMatchers.withText(mockUserEmailList.toString())))
     }
 
- */
+    @Test
+    fun correctDifficulty() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
+        var mockRoomName = "mockRoom"
+        var mockUserEmailList = mutableListOf<String>("email1, email2")
+        var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
+        var mockPartyRoom = PartyRoom()
+
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
+
+        mockPartyRoom.setEmailList(mockUserEmailList)
+
+        createMockInvocation(mockPartyRoom, mockSongList, true, mockRoomName)
+
+        val intent = Intent(ctx, PartyRoomActivity::class.java)
+        intent.putExtra("roomName", mockRoomName)
+        intent.putExtra("createRoom", true)
+
+        val scn: ActivityScenario<PartyRoomActivity> = ActivityScenario.launch(intent)
+
+        Intents.intended(IntentMatchers.hasComponent(TypingGameActivity ::class.java.name))
+        Intents.intended(IntentMatchers.hasExtra("Difficulty", R.string.GameSetup_easy))
+    }
+
+    @Test
+    fun correctRoomID() {
+        val ctx: Context = ApplicationProvider.getApplicationContext()
+
+        var mockRoomID = "mockRoom"
+        var mockUserEmailList = mutableListOf<String>("email1, email2")
+        var mockSongList = mutableListOf<Pair<String, String>>(Pair("mockSong1", "mockSong2"))
+        var mockPartyRoom = PartyRoom()
+
+        AppPreferences.init(ctx)
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_mode), "local_typing")
+        AppPreferences.setStr(ctx.getString(R.string.preferences_game_genre), "imagine dragons")
+
+
+        mockPartyRoom.setEmailList(mockUserEmailList)
+
+        createMockInvocation(mockPartyRoom, mockSongList, false, mockRoomID)
+
+        val intent = Intent(ctx, PartyRoomActivity::class.java)
+        intent.putExtra("roomName", mockRoomID)
+        intent.putExtra("createRoom", false)
+
+        val scn: ActivityScenario<PartyRoomActivity> = ActivityScenario.launch(intent)
+
+        Espresso.onView(ViewMatchers.withId(R.id.roomId))
+            .check(ViewAssertions.matches(ViewMatchers.withText(mockRoomID)))
+
+
+    }
+
 }
 
- */
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/activity/ChoosePartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/ChoosePartyRoomActivity.kt
index 30be3d926..9622b8dd4 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/ChoosePartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/ChoosePartyRoomActivity.kt
@@ -30,7 +30,7 @@ class ChoosePartyRoomActivity : AppCompatActivity() {
 
     private fun switchToRoom(roomName: String, createRoom: Boolean) {
         val newIntent = Intent(this, PartyRoomActivity::class.java)
-        newIntent.putExtra("roomName", roomName)
+        newIntent.putExtra("roomID", roomName)
         newIntent.putExtra("createRoom", createRoom)
 
         startActivity(newIntent)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
index d5e6792fe..c4253bf4e 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/PartyRoomActivity.kt
@@ -1,49 +1,142 @@
 package ch.sdp.vibester.activity
 
 import android.content.ContentValues
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
+import android.widget.Button
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import ch.sdp.vibester.R
+import ch.sdp.vibester.api.LastfmApiInterface
+import ch.sdp.vibester.api.LastfmMethod
+import ch.sdp.vibester.api.LastfmUri
+import ch.sdp.vibester.database.AppPreferences
 import ch.sdp.vibester.database.DataGetter
 import ch.sdp.vibester.database.Database
+import ch.sdp.vibester.helper.GameManager
 import ch.sdp.vibester.helper.PartyRoom
 import ch.sdp.vibester.user.User
 import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.ValueEventListener
+import com.google.gson.Gson
 import dagger.hilt.android.AndroidEntryPoint
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 import javax.inject.Inject
+import kotlin.properties.Delegates
 
 @AndroidEntryPoint
 class PartyRoomActivity : AppCompatActivity() {
     @Inject
     lateinit var dataGetter: DataGetter
 
+    lateinit var gameManager: GameManager
+
+    lateinit var roomID: String
+
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_party_room)
 
-        val roomName = intent.getStringExtra("roomName").toString()
         val createPartyRoom = intent.getBooleanExtra("createRoom", false)
         if(createPartyRoom) {
-            createRoom(roomName)
+            createRoom()
+            setGameManager()
+            dataGetter.updateRoomField(roomID, "gameStarted", false)
         }
         else {
-            fetchData(roomName)
+            this.roomID = intent.getStringExtra("roomID").toString()
+            fetchData(roomID)
         }
+
+        val startGame = findViewById<Button>(R.id.startGame)
+
+        startGame.setOnClickListener {
+            dataGetter.updateRoomField(roomID, "gameStarted", true)
+        }
+
+        fetchGameStarted(roomID, this::startGame)
     }
 
-    private fun updateUI(partyRoom: PartyRoom) {
+    private fun updateUI(partyRoom: PartyRoom, roomID: String) {
+        this.roomID = roomID
         findViewById<TextView>(R.id.emails).text = partyRoom.getEmailList().toString()
+        findViewById<TextView>(R.id.roomId).text = roomID
     }
 
-    private fun fetchData(roomName: String) {
-        dataGetter.getRoomData(roomName, this::updateUI)
+    private fun fetchData(roomID: String) {
+        dataGetter.getRoomData(roomID, this::updateUI, this::setSongs)
     }
 
-    private fun createRoom(roomName: String) {
-        dataGetter.createRoom(roomName, this::updateUI)
+    private fun createRoom() {
+        dataGetter.createRoom(this::updateUI)
     }
+
+    private fun fetchGameStarted(roomName: String, callback: (Boolean) -> Unit) {
+        dataGetter.readStartGame(roomName, callback)
+    }
+
+    private fun startGame(gameStarted: Boolean) {
+        if(gameStarted) {
+            launchGame(gameManager)
+        }
+    }
+
+    private fun  setGameManager() {
+        gameManager = GameManager()
+        gameManager.gameSize = 1
+
+        chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = "Imagine Dragons", mode = R.string.gameGenre_imagine_dragons)
+    }
+
+
+    private fun launchGame(newGameManager: GameManager) {
+
+        val newIntent = Intent(this, TypingGameActivity::class.java)
+        newIntent.putExtra("gameManager", newGameManager)
+        newIntent.putExtra("Difficulty", R.string.GameSetup_easy)
+
+        startActivity(newIntent)
+    }
+
+    private fun setGameSongList(uri: LastfmUri, roomID: String) {
+        val service = LastfmApiInterface.createLastfmService()
+        val call = service.getSongList(uri.convertToHashmap())
+        call.enqueue(object : Callback<Any> {
+            override fun onFailure(call: Call<Any>, t: Throwable?) {}
+            override fun onResponse(call: Call<Any>, response: Response<Any>) {
+                gameManager.setGameSongList(Gson().toJson(response.body()), uri.method)
+                dataGetter.updateRoomField(roomID, "songList", gameManager.getSongList())
+            }
+        })
+    }
+
+    private fun chooseGenre(method: String = "", artist: String = "", tag: String = "", mode: Int = 0) {
+        val uri = LastfmUri()
+
+        uri.method = method
+        uri.artist = artist
+        uri.tag = tag
+
+        gameManager.gameMode = getString(mode)
+        AppPreferences.setStr(getString(R.string.preferences_game_genre), getString(mode))
+
+        setGameSongList(uri, roomID)
+    }
+
+    private fun setSongs(gameSongList: MutableList<Pair<String, String>>) {
+        gameManager = GameManager()
+        gameManager.gameSize = 1
+        gameManager.gameMode = getString(R.string.gameGenre_imagine_dragons)
+
+        gameManager.gameSongList = gameSongList
+
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
index 40dd8ac91..d2bec1a0c 100644
--- a/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
+++ b/app/src/main/java/ch/sdp/vibester/database/DataGetter.kt
@@ -1,6 +1,7 @@
 package ch.sdp.vibester.database
 
 import android.content.ContentValues
+import android.content.ContentValues.TAG
 import android.util.Log
 import ch.sdp.vibester.auth.FireBaseAuthenticator
 import ch.sdp.vibester.helper.PartyRoom
@@ -10,7 +11,9 @@ import com.google.firebase.database.DataSnapshot
 import com.google.firebase.database.DatabaseError
 import com.google.firebase.database.ValueEventListener
 import com.google.firebase.database.ktx.getValue
+import java.util.*
 import javax.inject.Inject
+import kotlin.collections.ArrayList
 import kotlin.reflect.KFunction0
 
 /**
@@ -128,9 +131,8 @@ class DataGetter @Inject constructor() {
      * @param roomName the name of the new room
      * @param callback function to be called when the room has been created
      */
-    fun createRoom(roomName: String,  callback: (PartyRoom) -> Unit) {
+    fun createRoom(callback: (PartyRoom, String) -> Unit) {
         val partyRoom = PartyRoom()
-        partyRoom.setRoomName(roomName)
         partyRoom.setEmailList(mutableListOf(authenticator.getCurrUser()?.email!!))
         val ref = dbRoomRef.push()
         val key = ref.key
@@ -138,7 +140,9 @@ class DataGetter @Inject constructor() {
             partyRoom.setRoomID(key)
         }
         ref.setValue(partyRoom)
-        callback(partyRoom)
+        if (key != null) {
+            callback(partyRoom, key)
+        }
     }
 
 
@@ -208,16 +212,19 @@ class DataGetter @Inject constructor() {
         return authenticator.getCurrUser()
     }
 
-    /**
+        /**
      * This functions fetches the data of the given user from the database
-     * @param roomName the name of the room to retrieve data from
-     * @param callback the function to be called when the data of the appropriate user is available
+     * @param roomID the name of the room to retrieve data from
+     * @param partyRoomCallback the function to be called when the data of the appropriate room data is available
+     * @param songListCallback the function to be called when the data of the appropriate song list is available
      */
+    fun getRoomData(roomID: String,
+                    partyRoomCallback: (PartyRoom, String) -> Unit,
+                    songListCallback: (MutableList<Pair<String, String>>) -> Unit) {
 
-    fun getRoomData(roomName: String, callback: (PartyRoom) -> Unit) {
         val queryRooms = dbRoomRef
-            .orderByChild("roomName")
-            .equalTo(roomName)
+            .orderByChild("roomID")
+            .equalTo(roomID)
 
         queryRooms.addValueEventListener(object : ValueEventListener {
             override fun onDataChange(dataSnapshot: DataSnapshot) {
@@ -229,8 +236,21 @@ class DataGetter @Inject constructor() {
                             partyRoom.addUserEmail(currUserEmail)
                             updateRoomUserList(partyRoom)
                         }
-                        callback(partyRoom)
+                        partyRoomCallback(partyRoom, partyRoom.getRoomID())
+                    }
+                    val snapshotMap = snapshot.value as Map<String, Object>
+                    val songList = snapshotMap["songList"] as List<*>
+                    var gameSongList: MutableList<Pair<String, String>> = mutableListOf()
+                    for (song in songList) {
+                        val tempPair: Map<String, String> = song as Map<String, String>
+                        gameSongList.add(
+                            Pair(
+                                tempPair.getOrDefault("first", ""),
+                                tempPair.getOrDefault("second", "")
+                            )
+                        )
                     }
+                    songListCallback(gameSongList)
                 }
             }
             override fun onCancelled(error: DatabaseError) {
@@ -238,4 +258,47 @@ class DataGetter @Inject constructor() {
             }
         })
     }
+
+    /**
+     * This functions that updates the field of a room entry
+     * @param roomID ID of the room
+     * @param fieldName name of the field to update
+     * @param value new value to write to the database
+     */
+    /**
+     * This functions that updates the field of a room entry
+     * @param roomID ID of the room
+     * @param fieldName name of the field to update
+     * @param value new value to write to the database
+     */
+    fun <T> updateRoomField(roomID: String, fieldName: String, value: T) {
+        dbRoomRef.child("${roomID}/${fieldName}").setValue(value)
+    }
+    
+    /**
+     * This functions reads the start of the game field and calls the appropriate functions
+     * @param roomID ID of the room
+     * @param callback callback to be called when the read value is available
+     */
+    /**
+     * This functions reads the start of the game field and calls the appropriate functions
+     * @param roomID ID of the room
+     * @param callback callback to be called when the read value is available
+     */
+    fun readStartGame(roomID: String, callback: (Boolean) -> Unit) {
+        val queryRooms = dbRoomRef.child(roomID).child("gameStarted")
+
+        val startGameListener = object : ValueEventListener {
+            override fun onDataChange(dataSnapshot: DataSnapshot) {
+                val value = dataSnapshot.getValue<Boolean>()
+                if (value != null) {
+                  callback(value)
+                }
+            }
+            override fun onCancelled(databaseError: DatabaseError) {
+                Log.w(TAG, "loadPost:onCancelled", databaseError.toException())
+            }
+        }
+        queryRooms.addValueEventListener(startGameListener)
+}
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt b/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt
index e831fd286..5e9cf8a90 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/PartyRoom.kt
@@ -2,7 +2,6 @@ package ch.sdp.vibester.helper
 
 
 class PartyRoom() {
-    private lateinit var roomName: String
     private lateinit var userEmails: MutableList<String>
     private lateinit var roomID: String
 
@@ -22,15 +21,8 @@ class PartyRoom() {
         return userEmails
     }
 
-    fun getRoomName(): String {
-        return roomName
-    }
-
-    fun setRoomName(roomName: String) {
-        this.roomName = roomName
-    }
-
     fun setEmailList(userEmails: MutableList<String>) {
         this.userEmails = userEmails
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_party_room.xml b/app/src/main/res/layout/activity_party_room.xml
index f136e7fc0..17ca6d46b 100644
--- a/app/src/main/res/layout/activity_party_room.xml
+++ b/app/src/main/res/layout/activity_party_room.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:visibility="visible"
     tools:context=".activity.PartyRoomActivity">
 
     <TextView
@@ -18,4 +19,26 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.275" />
+
+    <TextView
+        android:id="@+id/roomId"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.36" />
+
+    <Button
+        android:id="@+id/startGame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="134dp"
+        android:text="start game"
+        android:visibility="visible"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/emails" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file