diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/DeleteSongsActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/DeleteSongsActivityTest.kt
index 4603aa4f4..3f9edafaf 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/DeleteSongsActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/DeleteSongsActivityTest.kt
@@ -72,12 +72,17 @@ class DeleteSongsActivityTest {
         val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
         var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
         records.createNewFile()
-        records.appendText("Testing 1\n")
-        records.appendText("Testing 2\n")
+        records.appendText("Song 1 - Artist 1\n")
+        records.appendText("Song 2 - Artist 2\n")
 
-        var testing1 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Testing 1")
+        var properties = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        properties.createNewFile()
+        properties.appendText("Song 1 - Artist 1 - Artwork 1 - Preview 1\n")
+        properties.appendText("Song 2 - Artist 2 - Artwork 2 - Preview 2\n")
+
+        var testing1 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 1 - Artist 1")
         testing1.createNewFile()
-        var testing2 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Testing 2")
+        var testing2 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 2 - Artist 2")
         testing2.createNewFile()
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), DeleteSongsActivity::class.java)
@@ -89,9 +94,10 @@ class DeleteSongsActivityTest {
         }
 
 
-        onView(withId(layout.getChildAt(0).id)).check(matches(withText("TESTING 1")))
-        onView(withId(layout.getChildAt(1).id)).check(matches(withText("TESTING 2")))
+        onView(withId(layout.getChildAt(0).id)).check(matches(withText("SONG 1 - ARTIST 1")))
+        onView(withId(layout.getChildAt(1).id)).check(matches(withText("SONG 2 - ARTIST 2")))
         records.delete()
+        properties.delete()
         testing1.delete()
         testing2.delete()
     }
@@ -101,12 +107,17 @@ class DeleteSongsActivityTest {
         val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
         var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
         records.createNewFile()
-        records.appendText("Testing 1\n")
-        records.appendText("Testing 2\n")
+        records.appendText("Song 1 - Artist 1\n")
+        records.appendText("Song 2 - Artist 2\n")
+
+        var properties = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        properties.createNewFile()
+        properties.appendText("Song 1 - Artist 1 - Artwork 1 - Preview 1\n")
+        properties.appendText("Song 2 - Artist 2 - Artwork 2 - Preview 2\n")
 
-        var testing1 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Testing 1")
+        var testing1 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 1 - Artist 1")
         testing1.createNewFile()
-        var testing2 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Testing 2")
+        var testing2 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 2 - Artist 2")
         testing2.createNewFile()
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), DeleteSongsActivity::class.java)
@@ -121,9 +132,10 @@ class DeleteSongsActivityTest {
 
         assert(!testing1.exists())
         assert(testing2.exists())
-        onView(withId(layout.getChildAt(0).id)).check(matches(withText("TESTING 2")))
+        onView(withId(layout.getChildAt(0).id)).check(matches(withText("SONG 2 - ARTIST 2")))
 
         records.delete()
+        properties.delete()
         testing1.delete()
         testing2.delete()
     }
@@ -133,12 +145,17 @@ class DeleteSongsActivityTest {
         val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
         var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
         records.createNewFile()
-        records.appendText("Testing 1\n")
-        records.appendText("Testing 2\n")
+        records.appendText("Song 1 - Artist 1\n")
+        records.appendText("Song 2 - Artist 2\n")
 
-        var testing1 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Testing 1")
+        var properties = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        properties.createNewFile()
+        properties.appendText("Song 1 - Artist 1 - Artwork 1 - Preview 1\n")
+        properties.appendText("Song 2 - Artist 2 - Artwork 2 - Preview 2\n")
+
+        var testing1 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 1 - Artist 1")
         testing1.createNewFile()
-        var testing2 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Testing 2")
+        var testing2 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 2 - Artist 2")
         testing2.createNewFile()
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), DeleteSongsActivity::class.java)
@@ -153,9 +170,10 @@ class DeleteSongsActivityTest {
 
         assert(testing1.exists())
         assert(!testing2.exists())
-        onView(withId(layout.getChildAt(0).id)).check(matches(withText("TESTING 1")))
+        onView(withId(layout.getChildAt(0).id)).check(matches(withText("SONG 1 - ARTIST 1")))
 
         records.delete()
+        properties.delete()
         testing1.delete()
         testing2.delete()
     }
@@ -165,12 +183,17 @@ class DeleteSongsActivityTest {
         val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
         var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
         records.createNewFile()
-        records.appendText("Testing 1\n")
-        records.appendText("Testing 2\n")
+        records.appendText("Song 1 - Artist 1\n")
+        records.appendText("Song 2 - Artist 2\n")
+
+        var properties = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        properties.createNewFile()
+        properties.appendText("Song 1 - Artist 1 - Artwork 1 - Preview 1\n")
+        properties.appendText("Song 2 - Artist 2 - Artwork 2 - Preview 2\n")
 
-        var testing1 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Testing 1")
+        var testing1 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 1 - Artist 1")
         testing1.createNewFile()
-        var testing2 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Testing 2")
+        var testing2 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 2 - Artist 2")
         testing2.createNewFile()
 
         val intent = Intent(ApplicationProvider.getApplicationContext(), DeleteSongsActivity::class.java)
@@ -189,6 +212,7 @@ class DeleteSongsActivityTest {
         onView(withId(layout.getChildAt(0).id)).check(matches(withText(R.string.delete_nothing_to_delete)))
 
         records.delete()
+        properties.delete()
         testing1.delete()
         testing2.delete()
     }
diff --git a/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt b/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
index 6bc71fe84..e9d440657 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/activity/DownloadActivityTest.kt
@@ -76,6 +76,12 @@ class DownloadActivityTest {
             if(records.exists()) {
                 records.delete()
             }
+
+            val properties = File(activity.applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+            assert(!properties.exists())
+            if(properties.exists()) {
+                properties.delete()
+            }
         }
     }
 
diff --git a/app/src/androidTest/java/ch/sdp/vibester/fragment/GameSetupFragmentTest.kt b/app/src/androidTest/java/ch/sdp/vibester/fragment/GameSetupFragmentTest.kt
index ebd9cf1e9..34e07cf68 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/fragment/GameSetupFragmentTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/fragment/GameSetupFragmentTest.kt
@@ -297,5 +297,13 @@ class GameSetupFragmentTest {
         onView(withId(R.id.validateSearch)).perform(scrollTo(), click())
     }
 
+    @Test
+    fun internetButtonClick() {
+        onView(withId(R.id.game_setup_has_internet)).check(matches(withText("Internet is on")))
+        onView(withId(R.id.game_setup_has_internet)).perform(click())
+        onView(withId(R.id.game_setup_has_internet)).check(matches(withText("Internet is off")))
+        onView(withId(R.id.game_setup_has_internet)).perform(click())
+        onView(withId(R.id.game_setup_has_internet)).check(matches(withText("Internet is on")))
+    }
 
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/helper/GameManagerTest.kt b/app/src/androidTest/java/ch/sdp/vibester/helper/GameManagerTest.kt
index 402d69baa..b1aa11913 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/helper/GameManagerTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/helper/GameManagerTest.kt
@@ -1,8 +1,12 @@
 package ch.sdp.vibester.helper
 
+import android.os.Environment
+import androidx.test.platform.app.InstrumentationRegistry
 import ch.sdp.vibester.api.LastfmMethod
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Test
+import java.io.File
 
 class GameManagerTest {
     private fun setGameManager(valid:Boolean = true): GameManager {
@@ -85,4 +89,133 @@ class GameManagerTest {
         assertEquals(gameManager.getCurrentSong().getArtistName().lowercase(), "imagine dragons")
         assertEquals(gameManager.getCurrentSong().getTrackName().lowercase(), "monday")
     }
+
+    //OFFLINE TESTS
+
+    private fun offlineTestSetup(): GameManager {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
+        var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+        records.createNewFile()
+        records.appendText("Song 1 - Artist 1\n")
+
+        var properties = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        properties.createNewFile()
+        properties.appendText("Song 1 - Artist 1 - Artwork 1 - Preview 1\n")
+
+        var testing1 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 1 - Artist 1")
+        testing1.createNewFile()
+        var testing2 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 2 - Artist 2")
+        testing2.createNewFile()
+
+        lateinit var manager: GameManager
+        val path = context?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+        if(path != null) {
+            manager = createOfflineGameManager(path)
+        }
+        return manager
+    }
+
+    private fun createOfflineGameManager(path: File): GameManager {
+        val gameManager = GameManager()
+        if(path != null) {
+            gameManager.setOffline(path, false)
+        }
+        gameManager.setGameSongList("", LastfmMethod.BY_TAG.method)
+        return gameManager
+    }
+
+    @Test
+    fun checkExistsError() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
+        val gameManager = offlineTestSetup()
+
+        var properties = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        if(properties.exists()){
+            properties.delete()
+        }
+
+        assert(!gameManager.setNextSong())
+
+        offlineTestCleanup()
+    }
+
+    @Test
+    fun checkEmptyLineError() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
+        val gameManager = offlineTestSetup()
+
+        var properties = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        if(properties.exists()) {
+            properties.delete()
+        }
+        properties.createNewFile()
+        properties.appendText("\n")
+
+        assert(!gameManager.setNextSong())
+
+        offlineTestCleanup()
+    }
+
+    @Test
+    fun checkIncorrectInformationInPropertiesShort() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
+        val gameManager = offlineTestSetup()
+
+        var properties = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        if(properties.exists()){
+            properties.delete()
+        }
+        properties.createNewFile()
+        properties.appendText("Song 1 - Artist 1 - Preview 1\n")
+
+        assert(!gameManager.setNextSong())
+
+        offlineTestCleanup()
+    }
+
+    @Test
+    fun checkIncorrectInformationInPropertiesLong() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
+        val gameManager = offlineTestSetup()
+
+        var properties = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        if(properties.exists()){
+            properties.delete()
+        }
+        properties.createNewFile()
+        properties.appendText("Song 1 - Artist 1 - Preview 1 - Artwork 1 - Extra 1\n")
+
+        assert(!gameManager.setNextSong())
+
+        offlineTestCleanup()
+    }
+
+    @Test
+    fun checkCurrentSong() {
+        val gameManager = offlineTestSetup()
+
+        assert(gameManager.setNextSong())
+
+        val curSong = gameManager.currentSong
+        assertEquals(curSong.getTrackName(), "Song 1")
+        assertEquals(curSong.getArtistName(), "Artist 1")
+        assertEquals(curSong.getPreviewUrl(), "Preview 1")
+        assertEquals(curSong.getArtworkUrl(), "Artwork 1")
+
+
+        offlineTestCleanup()
+    }
+
+    private fun offlineTestCleanup() {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
+        var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+        var properties = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        var testing1 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 1 - Artist 1")
+        var testing2 = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_Song 2 - Artist 2")
+
+        records.delete()
+        properties.delete()
+        testing1.delete()
+        testing2.delete()
+    }
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
index 37d6a8ae8..e7be83155 100644
--- a/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
+++ b/app/src/androidTest/java/ch/sdp/vibester/model/OfflineSongListTest.kt
@@ -12,7 +12,11 @@ class OfflineSongListTest {
     @Test
     fun noSongsAvailableInitialization() {
         val context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext
-        val mySongsList = OfflineSongList(context)
+        val path = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+        lateinit var mySongsList: OfflineSongList
+        if (path != null) {
+            mySongsList = OfflineSongList(path)
+        }
 
         val inputSongsList = mutableListOf<Pair<String, String>>()
         val page = "1"
@@ -35,7 +39,11 @@ class OfflineSongListTest {
         records.createNewFile()
         records.appendText("bones - imagine dragons\n")
 
-        val mySongsList = OfflineSongList(context)
+        val path = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+        lateinit var mySongsList: OfflineSongList
+        if (path != null) {
+            mySongsList = OfflineSongList(path)
+        }
 
         val songName = "bones"
         val artistName = "imagine dragons"
diff --git a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
index ba8ac88f4..b20867a3e 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/BuzzerScreenActivity.kt
@@ -107,7 +107,11 @@ class BuzzerScreenActivity : GameActivity() {
         val trackName = gameManager.getCurrentSong().getTrackName()
         val artist = gameManager.getCurrentSong().getArtistName()
         findViewById<TextView>(R.id.songTitle).text= "$trackName - $artist"
-        Glide.with(ctx).load(gameManager.getCurrentSong().getArtworkUrl()).override(artworkDim, artworkDim).into(findViewById(R.id.songArtwork))
+        //Checks if internet is available. If not, skip the loading of the artwork from url.
+        if(gameManager.getInternet()) {
+            Glide.with(ctx).load(gameManager.getCurrentSong().getArtworkUrl()).override(artworkDim, artworkDim).into(findViewById(R.id.songArtwork))
+        }
+
         gameManager.playSong()
         checkRunnable()
         super.barTimer(findViewById(R.id.progressBarBuzzer), ctx, gameManager, ::timeoutAnswer)
diff --git a/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt
index 2e54c7a68..2406c3ddb 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DeleteSongsActivity.kt
@@ -91,11 +91,12 @@ class DeleteSongsActivity : AppCompatActivity() {
 
         var currentLine = recordReader.readLine()
         var button: Button = btn as Button
+        val buttonText = button.text.toString()
 
-        while(currentLine != null) {
+        while (currentLine != null) {
             var trimmed = currentLine.trim()
 
-            if(trimmed == button.text.toString()) {
+            if (trimmed == buttonText) {
                 currentLine = recordReader.readLine()
                 continue
             }
@@ -108,15 +109,15 @@ class DeleteSongsActivity : AppCompatActivity() {
         recordWriter.close()
         recordReader.close()
 
-        if(tempRecords.length() == 0L) {
+        if (tempRecords.length() == 0L) {
             createNoSongsView(layout)
         }
 
         records.delete()
-        if(tempRecords.renameTo(records)) {
+        if (tempRecords.renameTo(records) && removeFromProperties(buttonText)) {
             layout.removeView(btn)
             var songToDelete = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_${button.text}")
-            if(songToDelete.delete()) {
+            if (songToDelete.delete()) {
                 Toast.makeText(applicationContext, "Song successfully removed!", Toast.LENGTH_LONG).show()
                 return true
             }
@@ -125,6 +126,48 @@ class DeleteSongsActivity : AppCompatActivity() {
         return false
     }
 
+    /**
+     * Removes the line correspoding to the song-to-be-deleted from the properties.txt file.
+     * @param buttonText: Text which contains song name - artist name
+     */
+    private fun removeFromProperties(buttonText: String): Boolean {
+        var properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
+        var tempProp = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "tempProp.txt")
+
+        var propReader = BufferedReader(FileReader(properties))
+        var propWriter = BufferedWriter(FileWriter(tempProp, true))
+
+        var currentLine = propReader.readLine()
+        val buttonSplit = buttonText.trim().split("-")
+
+        /*
+         * Current line here should be in the form of "song name - artist name - artwork url - preview url.
+         * We want to tokenize(split) this string into 4 tokens: song name, artist name, artwork url and preview url.
+         * Comparison between the first two tokens are checked to see whether this line is the one we want or not.
+         * We write every line on a new file except the one which we want to delete, thus we continue if we match.
+         */
+        while (currentLine != null) {
+            var trimmed = currentLine.trim()
+            val split = trimmed.split(" - ")
+
+            if (split[0].trim().lowercase() == buttonSplit[0].trim().lowercase()
+             && split[1].trim().lowercase() == buttonSplit[1].trim().lowercase()) {
+                currentLine = propReader.readLine()
+                continue
+            }
+
+            propWriter.write(currentLine)
+            propWriter.newLine()
+            currentLine = propReader.readLine()
+        }
+
+        propWriter.close()
+        propReader.close()
+
+        properties.delete()
+        return tempProp.renameTo(properties)
+    }
+
     /**
      * Handles the creation and initialization of a TextView which is then added to the layout.
      */
diff --git a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
index 09c3d63bf..26c4c380c 100644
--- a/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
+++ b/app/src/main/java/ch/sdp/vibester/activity/DownloadActivity.kt
@@ -101,6 +101,7 @@ class DownloadActivity : AppCompatActivity() {
         val songFuture = ItunesMusicApi.querySong(songName, OkHttpClient(), 1)
         try {
             song = Song.singleSong(songFuture.get())
+            songName = song.getTrackName().lowercase() + " - " + song.getArtistName().lowercase()
             checkPermissionsAndDownload()
         } catch (e: IllegalArgumentException) {
             alert(
@@ -204,16 +205,13 @@ class DownloadActivity : AppCompatActivity() {
             records.createNewFile()
         }
         records.appendText("$songName\n")
-        /* TODO: OFFLINE
         recordProperties()
-         */
     }
 
     /**
      * Records the properties of a song.
      * Order of storage: Track name - artist name - artwork URL - preview URL.
      */
-    /* TODO: OFFLINE
     private fun recordProperties() {
         var properties = File(applicationContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "properties.txt")
 
@@ -227,7 +225,6 @@ class DownloadActivity : AppCompatActivity() {
         val previewURL = song.getPreviewUrl()
         properties.appendText("$trackName - $artistName - $artworkURL - $previewURL\n")
     }
-     */
 
     fun switchToDeleteSongs(view: View) {
         val intent = Intent(this, DeleteSongsActivity::class.java)
diff --git a/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt b/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
index b7b6c31eb..38f33d808 100644
--- a/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
+++ b/app/src/main/java/ch/sdp/vibester/fragment/GameSetupFragment.kt
@@ -3,6 +3,7 @@ package ch.sdp.vibester.fragment
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.os.Environment
 import android.text.Editable
 import android.view.LayoutInflater
 import android.view.View
@@ -38,9 +39,8 @@ class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSe
     var gameSize = R.string.one.toString()
     var searchArtistEditable: Editable? = null
     lateinit var gameManager: GameManager
-    /* TODO: OFFLINE
+    // TODO: OFFLINE
     private var hasInternet: Boolean = true
-     */
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -60,6 +60,7 @@ class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSe
         view.findViewById<Button>(R.id.imagDragonsButton).setOnClickListener(this)
         view.findViewById<Button>(R.id.billieEilishButton).setOnClickListener(this)
         view.findViewById<Button>(R.id.difficulty_proceed).setOnClickListener(this)
+        view.findViewById<Button>(R.id.game_setup_has_internet).setOnClickListener(this)
 
         searchArtistEditable = view.findViewById<EditText>(R.id.searchArtist).text
         view.findViewById<Button>(R.id.validateSearch).setOnClickListener(this)
@@ -168,10 +169,11 @@ class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSe
         call.enqueue(object : Callback<Any> {
             override fun onFailure(call: Call<Any>, t: Throwable?) {}
             override fun onResponse(call: Call<Any>, response: Response<Any>) {
-                /* TODO: OFFLINE
-                gameManager.setInternet()
-                gameManager.setContext(context)
-                 */
+                // TODO: OFFLINE
+                val external = context?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+                if (external != null) {
+                    gameManager.setOffline(external, hasInternet)
+                }
                 gameManager.setGameSongList(Gson().toJson(response.body()), uri.method)
             }
         })
@@ -231,8 +233,24 @@ class GameSetupFragment : Fragment(), View.OnClickListener, AdapterView.OnItemSe
             R.id.validateSearch -> chooseGenre(method = LastfmMethod.BY_ARTIST.method, artist = searchArtistEditable.toString(), mode = R.string.byArtistSearch)
 
             R.id.difficulty_proceed -> proceedGame()
+
+            R.id.game_setup_has_internet -> switchInternet(v.findViewById(R.id.game_setup_has_internet))
         }
     }
 
-
+    /**
+     * Switches between Internet On and Internet Off when the view button is pressed.
+     * @param view: The button responsible for internet toggling.
+     */
+    //TODO: OFFLINE
+    private fun switchInternet(view: View) {
+        val btn: Button = view as Button
+        if(hasInternet) {
+            hasInternet = false
+            btn.text = getString(R.string.GameSetup_internetSwitchOff)
+        } else {
+            hasInternet = true
+            btn.text = getString(R.string.GameSetup_internetSwitchOn)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ch/sdp/vibester/helper/GameManager.kt b/app/src/main/java/ch/sdp/vibester/helper/GameManager.kt
index f09910f37..b6fd59f07 100644
--- a/app/src/main/java/ch/sdp/vibester/helper/GameManager.kt
+++ b/app/src/main/java/ch/sdp/vibester/helper/GameManager.kt
@@ -1,11 +1,18 @@
 package ch.sdp.vibester.helper
 
+import android.content.Context
 import android.media.MediaPlayer
+import android.os.Environment
+import android.util.Log
 import ch.sdp.vibester.api.AudioPlayer
 import ch.sdp.vibester.api.ItunesMusicApi
+import ch.sdp.vibester.model.OfflineSongList
 import ch.sdp.vibester.model.Song
 import ch.sdp.vibester.model.SongList
 import okhttp3.OkHttpClient
+import java.io.BufferedReader
+import java.io.File
+import java.io.FileReader
 import java.io.Serializable
 import java.util.concurrent.CompletableFuture
 
@@ -23,9 +30,11 @@ open class GameManager : Serializable {
     private var artistName = ""
     private var songName = ""
     var nextSongInd = 0
+    private lateinit var mediaPlayer: CompletableFuture<MediaPlayer>
+
     private var hasInternet: Boolean = true
+    private lateinit var externals: File
 
-    private lateinit var mediaPlayer: CompletableFuture<MediaPlayer>
 
     /**
      * set the number of songs in this game
@@ -38,11 +47,35 @@ open class GameManager : Serializable {
 
     /**
      * Set a shuffled songList for a game
+     * HAS OFFLINE
      * @param jsonMeta: JSON song list from lastfm API
      * @param method: method for a game
      */
     fun setGameSongList(jsonMeta: String, method: String) {
-        gameSongList = SongList(jsonMeta, method).getShuffledSongList()
+        if (hasInternet) {
+            gameSongList = SongList(jsonMeta, method).getShuffledSongList()
+        } else {
+            gameSongList = OfflineSongList(externals).getShuffledDownloadedSongList()
+            Log.d("Size of the list", "${gameSongList.size}")
+            Log.d("First one is =====================================================", gameSongList[0].toString())
+        }
+    }
+
+    /**
+     * Sets the offline fields of this class. To be passed to OfflineSongList for access to storage.
+     * @param external: getExternalFilesDir(ENVIRONMENT.DIRECTORY_DOWNLOADS) call's result
+     * @param internet: True for available
+     */
+    fun setOffline(external: File, internet: Boolean) {
+        externals = external
+        hasInternet = internet
+    }
+
+    /**
+     * Retrieves the internet connection availability. Used to check if we can use Glide in BuzzerScreen or not.
+     */
+    fun getInternet(): Boolean {
+        return hasInternet
     }
 
     /**
@@ -120,6 +153,7 @@ open class GameManager : Serializable {
      * Set the next song to play. It can happened that the song from a list is not present in
      * Itunes API. In such case, the exception is called and the function is rerun with the
      * next song in the list.
+     * HAS OFFLINE
      * @return: true if the next song to play is set
      *          false otherwise
      */
@@ -128,21 +162,81 @@ open class GameManager : Serializable {
             val songPair = gameSongList[nextSongInd]
             songName = songPair.first
             artistName = songPair.second
-            val songName = songPair.first + " " + songPair.second
-            try {
-                currentSong =
-                    Song.singleSong(ItunesMusicApi.querySong(songName, OkHttpClient(), 1).get())
-                nextSongInd++
-                numPlayedSongs++
-            } catch (e: Exception) {
-                nextSongInd++
-                return setNextSong()
+            if(hasInternet) {
+                val songName = songPair.first + " " + songPair.second
+                try {
+                    currentSong =
+                        Song.singleSong(ItunesMusicApi.querySong(songName, OkHttpClient(), 1).get())
+                    Log.d("I'M ONLINEEEEEEEEEEEEEEEEEEEEEEEEE", currentSong.getTrackName())
+                    nextSongInd++
+                    numPlayedSongs++
+                } catch (e: Exception) {
+                    nextSongInd++
+                    return setNextSong()
+                }
+                return true
+            } else {
+                return setNextOfflineSong(songPair)
             }
-            return true
         }
         return false
     }
 
+    /**
+     * Function that handles setting the next song in the offline mode. Modularized to avoid
+     * Code Climate issues.
+     * HAS OFFLINE
+     * @param songPair: The pair of song-artist that corresponds to the next track.
+     */
+    private fun setNextOfflineSong(songPair: Pair<String, String>): Boolean {
+        try {
+            val properties = File(externals, "properties.txt")
+            if(!properties.exists() || properties.length() == 0L) {
+                throw Exception("No songs available in properties.txt")
+            } else {
+                readFromFile(properties, songPair)
+            }
+        } catch (e: Exception) {
+            Log.d("GameManager/setNextSong/Offline", e.message.toString())
+            return false
+        }
+        return true
+    }
+
+    /**
+     * Function that reads from the given file to check if the given pair of strings exist within it.
+     * If yes, then sets the current song.
+     * HAS OFFLINE
+     * @param file: The file in which to check for the existence of the pair
+     * @param songPair: The pair corresponding to the next song-artist.
+     */
+    private fun readFromFile(file: File, songPair: Pair<String, String>) {
+        var reader = BufferedReader(FileReader(file))
+        var currentLine = reader.readLine()
+
+        while (currentLine != null) {
+            var trimmed = currentLine.trim()
+            if (trimmed.isNotEmpty()) {
+                val split = trimmed.split(" - ")
+                if (split.size == 4) {
+                    if (split[0].trim().lowercase() == songPair.first.lowercase()
+                    &&  split[1].trim().lowercase() == songPair.second.lowercase()) {
+                        currentSong = Song.songBuilder(split[3].trim(), split[2].trim(), split[0].trim(), split[1].trim())
+                        nextSongInd++
+                        numPlayedSongs++
+                        break
+                    }
+                } else {
+                    throw Exception("Inconsistent number of information in properties.txt")
+                }
+            } else {
+                throw Exception("Trimmed line is empty")
+            }
+            currentLine = reader.readLine()
+        }
+        reader.close()
+    }
+
     /**
      * Check if mediaPlayer is initialized
      */
@@ -152,16 +246,18 @@ open class GameManager : Serializable {
 
     /**
      * Play current song with media player.
+     * HAS OFFLINE
      */
     fun playSong() {
         if(hasInternet) {
             mediaPlayer = AudioPlayer.playAudio(currentSong.getPreviewUrl())
         } else {
-            mediaPlayer = AudioPlayer.playAudio(currentSong.getPreviewUrl())
-            /* TODO: OFFLINE
-            var media = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "extract_of_$currentSong.getTrackName()")
-            mediaPlayer = AudioPlayer.playAudio(media.absolutePath)
-             */
+            val trackName = currentSong.getTrackName().trim() + " - " + currentSong.getArtistName().trim()
+            var media = File(externals, "extract_of_$trackName")
+            if(media.exists()) {
+                mediaPlayer = AudioPlayer.playAudio(media.absolutePath)
+            }
+
         }
     }
 
diff --git a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
index ed5c5a474..f5dd36b26 100644
--- a/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
+++ b/app/src/main/java/ch/sdp/vibester/model/OfflineSongList.kt
@@ -13,13 +13,13 @@ import java.io.FileReader
  * @param ctx: Context of the caller, to fetch the downloaded folder
  * @param method: Chosen playlist type
  */
-class OfflineSongList(ctx: Context) {
+class OfflineSongList(externalDir: File) {
     private var songList = mutableListOf<Pair<String, String>>()
     private val page = "1"
     private val songsPerPage = "100"
     private val totalPages = "20"
     private val totalSongs = "2000"
-    private var context = ctx
+    private var externals = externalDir
     private var emptySongs: Boolean = false
 
     init {
@@ -31,7 +31,7 @@ class OfflineSongList(ctx: Context) {
      * Saves the list of songs in songList
      */
     private fun fillList() {
-        var records = File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), "records.txt")
+        var records = File(externals, "records.txt")
 
 
         if (!records.exists() || records.length() == 0L) {
diff --git a/app/src/main/res/layout/fragment_game_setup.xml b/app/src/main/res/layout/fragment_game_setup.xml
index 24a97b699..39b2f1216 100644
--- a/app/src/main/res/layout/fragment_game_setup.xml
+++ b/app/src/main/res/layout/fragment_game_setup.xml
@@ -56,6 +56,30 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
+                    <LinearLayout
+                        android:id="@+id/game_setup_check_internet"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <Space
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+
+                        <Button
+                            android:id="@+id/game_setup_has_internet"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/GameSetup_internetSwitchOn" />
+
+                        <Space
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1" />
+                    </LinearLayout>
+
                     <TextView
                         android:id="@+id/singleplayer_game_txt"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38320a927..8e81e560a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -23,6 +23,10 @@
     <string name="qrScanning_noExistUid">Error not an existing uid</string>
     <string name="qrScanning_newFriend">Congratulations, you have a new friend</string>
 
+    <!-- GameSetup -->
+    <string name="GameSetup_internetSwitchOn">Internet is on</string>
+    <string name="GameSetup_internetSwitchOff">Internet is off</string>
+
     <!-- TypingGame -->
     <string name="TypingGame_currentRound">Round\ </string>
     <string name="TypingGame_yourScore0">Your score: 0</string>