diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 5380a26..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
-      <Target>
-        <type value="QUICK_BOOT_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_6_Pro_API_33.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-04-12T19:22:16.650353Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..f01eec3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,8 +5,8 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..69e8615
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.20" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 54d5acd..773fe0f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index a854d63..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/android-kotlin-fundamentals-starter-apps" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index d5bf187..51873f7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'com.chaquo.python'
     id 'androidx.navigation.safeargs.kotlin'
     id 'kotlin-parcelize'
 
@@ -16,25 +15,7 @@ android {
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
         }
-        python {
-            pyc{
-                src false
-            }
 
-            version "3.8"
-
-            pip{
-                install "spotipy"
-                install "youtube-search-python"
-                install "music-tag"
-                install "Pillow"
-                install "mutagen"
-
-
-
-            }
-
-        }
         applicationId "com.example.spotifydownloader"
         minSdk 24
         targetSdk 33
@@ -107,6 +88,10 @@ dependencies {
 
     implementation "io.coil-kt:coil:2.3.0"
 
+    implementation "com.squareup.retrofit2:retrofit:2.9.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.9.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:4.5.0"
+
 
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/Application.kt b/app/src/main/java/com/example/spotifydownloader/Application.kt
index fd70613..02b8125 100644
--- a/app/src/main/java/com/example/spotifydownloader/Application.kt
+++ b/app/src/main/java/com/example/spotifydownloader/Application.kt
@@ -2,8 +2,6 @@ package com.example.spotifydownloader
 
 import android.app.Application
 import android.widget.Toast
-import com.chaquo.python.Python
-import com.chaquo.python.android.AndroidPlatform
 import com.google.android.material.color.DynamicColors
 import com.yausername.ffmpeg.FFmpeg
 import com.yausername.youtubedl_android.YoutubeDL
@@ -24,7 +22,10 @@ class SpotifyDownloaderApplication : Application(){
                 withContext(Dispatchers.IO) {
                     YoutubeDL.getInstance().init(this@SpotifyDownloaderApplication)
                     FFmpeg.getInstance().init(this@SpotifyDownloaderApplication)
-                    YoutubeDL.getInstance().updateYoutubeDL(applicationContext)
+
+                    YoutubeDL.getInstance().updateYoutubeDL(this@SpotifyDownloaderApplication)
+                    println(YoutubeDL.getInstance().version(this@SpotifyDownloaderApplication))
+                    //YoutubeDL.getInstance().updateYoutubeDL(applicationContext)
                 }
             } catch (e: Exception) {
                 withContext(Dispatchers.Main) {
@@ -35,9 +36,7 @@ class SpotifyDownloaderApplication : Application(){
                     ).show()
                 }
             }
-            if (!Python.isStarted()) {
-                Python.start(AndroidPlatform(this@SpotifyDownloaderApplication))
-            }
+
 
         }
     }
diff --git a/app/src/main/java/com/example/spotifydownloader/Fragments/SongDownloadFragment.kt b/app/src/main/java/com/example/spotifydownloader/Fragments/SongDownloadFragment.kt
new file mode 100644
index 0000000..ed6c38e
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/Fragments/SongDownloadFragment.kt
@@ -0,0 +1,350 @@
+package com.example.spotifydownloader.Fragments
+
+import android.app.Activity
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Uri
+import android.os.Bundle
+import android.provider.DocumentsContract
+import android.util.Log
+import android.view.View
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
+import android.webkit.MimeTypeMap
+import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
+import androidx.core.view.forEach
+import androidx.documentfile.provider.DocumentFile
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
+import androidx.navigation.Navigation
+import androidx.navigation.fragment.navArgs
+import coil.load
+import com.example.spotifydownloader.R
+import com.example.spotifydownloader.databinding.FragmentSongDownloadBinding
+import com.example.spotifydownloader.model.songItemData
+import com.example.spotifydownloader.mp3agic.Mp3File
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.yausername.youtubedl_android.YoutubeDL
+import com.yausername.youtubedl_android.YoutubeDLException
+import com.yausername.youtubedl_android.YoutubeDLRequest
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import org.apache.commons.io.IOUtils
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.IOException
+import java.net.URL
+
+
+class SongDownloadFragment : Fragment(R.layout.fragment_song_download) {
+    private var fragmentSongDownload: FragmentSongDownloadBinding? = null
+    private val tag = "MainActivity"
+    private lateinit var bottomNav : BottomNavigationView
+    private lateinit var navController: NavController
+    private val args by navArgs<SongDownloadFragmentArgs>()
+    private var stop = false
+    private var songItems = mutableListOf<songItemData>()
+    private lateinit var binding:FragmentSongDownloadBinding
+
+
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+         binding = FragmentSongDownloadBinding.bind(view)
+
+        fragmentSongDownload = binding
+
+        navController = Navigation.findNavController(view)
+
+        bottomNav = activity?.findViewById(R.id.bottomNav)!!
+
+
+        val from_top : Animation by lazy { AnimationUtils.loadAnimation((context as Activity),
+            R.anim.from_top
+        ) }
+        val from_bottom : Animation by lazy { AnimationUtils.loadAnimation((context as Activity),
+            R.anim.from_bottom
+        ) }
+        bottomNav.startAnimation(from_top)
+        bottomNav.menu.forEach {
+            it.isEnabled = false
+        }
+
+        val callback = object  : OnBackPressedCallback(true){
+            override fun handleOnBackPressed() {
+                Toast.makeText((context as Activity),"Stopping...",Toast.LENGTH_SHORT).show()
+                stop = true
+            }
+        }
+        requireActivity().onBackPressedDispatcher.addCallback(callback)
+
+        binding.albumCover.load(args.DataSearch.imgUrl)
+        binding.songName.text = args.DataSearch.songName
+        binding.artistName.text = args.DataSearch.artistName
+
+
+        lifecycleScope.launch (Dispatchers.IO){
+
+
+            when(download()){
+                0->{
+                    delay(1000L)
+                    runOnUiThread {
+                        Toast.makeText(
+                            context as Activity,
+                            "Finished",
+                            Toast.LENGTH_SHORT
+                        ).show()
+                        navController.popBackStack()
+                        bottomNav.startAnimation(from_bottom)
+                        bottomNav.menu.forEach {
+                            it.isEnabled = true
+                        }
+
+
+                    }
+
+                }
+                1->{
+                    runOnUiThread {
+                        Toast.makeText(
+                            context as Activity,
+                            "Internet Connection Error",
+                            Toast.LENGTH_SHORT
+                        ).show()
+                        navController.popBackStack()
+                        bottomNav.startAnimation(from_bottom)
+                        bottomNav.menu.forEach {
+                            it.isEnabled = true
+                        }
+
+
+                    }
+
+                }
+                2->{
+                    delay(1000L)
+                    runOnUiThread {
+                        Toast.makeText(
+                            context as Activity,
+                            "Finished",
+                            Toast.LENGTH_SHORT
+                        ).show()
+                        navController.popBackStack()
+                        bottomNav.startAnimation(from_bottom)
+                        bottomNav.menu.forEach {
+                            it.isEnabled = true
+                        }
+
+
+                    }
+
+                }
+
+            }
+
+
+        }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    }
+    override fun onDestroyView() {
+        // Consider not storing the binding instance in a field
+        // if not needed.
+        super.onDestroyView()
+        stop = true
+    }
+    private fun isDeviceOnline(context: Context): Boolean {
+        val connManager =
+            context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val networkCapabilities = connManager.getNetworkCapabilities(connManager.activeNetwork)
+        return if (networkCapabilities == null) {
+            println("Device Offline")
+            false
+        } else {
+            true
+        }
+    }
+    private fun Fragment?.runOnUiThread(action: () -> Unit) {
+        this ?: return
+        if (!isAdded) return // Fragment not attached to an Activity
+        activity?.runOnUiThread(action)
+    }
+    private fun download(): Int {
+
+
+
+
+
+
+
+        val data = args.DataSearch.folderUri
+        val tmpFile = File.createTempFile(
+            "Spotify downloader",
+            null,
+            (context as Activity).externalCacheDir
+        )
+        tmpFile.delete()
+        tmpFile.mkdir()
+        tmpFile.deleteOnExit()
+        val datas = args.DataSearch
+
+        try {
+            val fileLocation = "${tmpFile.absolutePath}/${datas.filename}"
+            val request =   YoutubeDLRequest("ytsearch:${datas.songName} ${datas.artistName}")
+
+
+            request.addOption("--output", "${fileLocation}TMP.mp3")
+            request.addOption("-x")
+            request.addOption("--audio-format", "mp3")
+            request.addOption("-R", "2")
+            request.addOption("--socket-timeout", "40")
+            println(request.buildCommand())
+
+
+            val documentFIle: DocumentFile =
+                DocumentFile.fromTreeUri((context as Activity), data!!)!!
+            val dc: DocumentFile? = documentFIle.findFile("${datas.filename}.mp3")
+            println("${datas.filename}.mp3")
+            if (isDeviceOnline(context as Activity)&& dc?.exists()==null){
+
+                try {
+                    YoutubeDL.getInstance().execute(
+                        request
+                    ) { progress: Float, _: Long, _: String? ->
+
+                        if(progress>0){
+                            runOnUiThread {
+                                binding.progressBar.progress = progress.toInt()
+                            }
+                        }
+                        //Log.d(tag,"Progress is $progress and the song is $songName")
+
+
+
+                    }
+
+                }
+                catch (e: YoutubeDLException) {
+                    Log.e(tag, e.message!!)
+                    tmpFile.deleteRecursively()
+                    return 1
+                }
+                val mp3file = Mp3File("${fileLocation}TMP.mp3")
+                val image :ByteArray?
+                try {
+                    image = getImageBytes(datas.imgUrl)
+
+                    mp3file.id3v2Tag.setAlbumImage(image,"image/jpeg")
+                    mp3file.id3v2Tag.title = datas.songName
+                    mp3file.id3v2Tag.album = datas.albumName
+                    mp3file.id3v2Tag.albumArtist = datas.albumArtistName
+                    mp3file.id3v2Tag.date = datas.releaseDate
+                    mp3file.id3v2Tag.albumArtist = datas.albumArtistName
+                    mp3file.save("$fileLocation.mp3")
+
+                }catch (e: IOException){
+                    return 1
+                }
+                var destUri = data
+                val treeUri = Uri.parse(destUri.toString())
+                val docId = DocumentsContract.getTreeDocumentId(treeUri)
+                val destDir = DocumentsContract.buildDocumentUriUsingTree(treeUri, docId)
+                val fileTempLocation = File("${fileLocation}.mp3")
+                val mimeType =
+                    MimeTypeMap.getSingleton()
+                        .getMimeTypeFromExtension(fileTempLocation.extension) ?: "*/*"
+                destUri = DocumentsContract.createDocument(
+                    (context as Activity).contentResolver,
+                    destDir,
+                    mimeType,
+                    fileTempLocation.name.toString()
+                )
+                val ins = fileTempLocation.inputStream()
+                val ops = (context as Activity).contentResolver.openOutputStream(destUri!!)
+                IOUtils.copy(ins, ops)
+                IOUtils.closeQuietly(ops)
+                IOUtils.closeQuietly(ins)
+
+            }
+            else if (!(isDeviceOnline(context as Activity))) {
+                Log.e(tag, "Connection Error")
+                tmpFile.deleteRecursively()
+                return 1
+            } else {
+                runOnUiThread {
+                    binding.progressBar.progress = binding.progressBar.max
+                }
+                Log.d(tag, "Already exists skipping")
+                tmpFile.deleteRecursively()
+
+
+
+                return 2
+            }
+            Log.d(tag, "No errors")
+
+
+            tmpFile.deleteRecursively()
+            return 0
+        }catch (e: java.lang.NullPointerException) {
+            tmpFile.deleteRecursively()
+            return 4
+        }
+
+
+
+
+
+
+
+
+    }
+
+    private fun getImageBytes(imageUrl: String): ByteArray? {
+        val url = URL(imageUrl)
+        val output = ByteArrayOutputStream()
+        url.openStream().use { stream ->
+            val buffer = ByteArray(10000)
+            while (true) {
+                val bytesRead = stream.read(buffer)
+                if (bytesRead < 0) {
+                    break
+                }
+                output.write(buffer, 0, bytesRead)
+            }
+        }
+        return output.toByteArray()
+    }
+
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/Fragments/SongFragment.kt b/app/src/main/java/com/example/spotifydownloader/Fragments/SongFragment.kt
new file mode 100644
index 0000000..5d8d09b
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/Fragments/SongFragment.kt
@@ -0,0 +1,230 @@
+package com.example.spotifydownloader.Fragments
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.net.ConnectivityManager
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
+import androidx.navigation.Navigation
+import com.example.spotifydownloader.R
+import com.example.spotifydownloader.SpotifyApi.SpotifyApi
+import com.example.spotifydownloader.SpotifyApi.util.Constants.Companion.CLIENT_ID
+import com.example.spotifydownloader.SpotifyApi.util.Constants.Companion.CLIENT_SECRET
+import com.example.spotifydownloader.databinding.FragmentSongBinding
+import com.example.spotifydownloader.model.DataSearch
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import java.io.IOException
+import java.lang.NullPointerException
+
+
+
+class SongFragment : Fragment(R.layout.fragment_song) {
+    private lateinit var binding: FragmentSongBinding
+    private var data: Intent? = null
+    private val tag = "MainActivity"
+    private lateinit var navController: NavController
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        binding = FragmentSongBinding.bind(view)
+        super.onViewCreated(view, savedInstanceState)
+
+
+        navController = Navigation.findNavController(view)
+        val resultLauncher =
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                if (result.resultCode == Activity.RESULT_OK) {
+                    // There are no request codes
+                    data = result.data
+                    if (data != null) {
+                        Log.d(tag, data?.data.toString())
+                        Log.d(tag, (context as Activity).externalCacheDir.toString())
+
+                    }
+
+                }
+
+            }
+
+        binding.perms.setOnClickListener {
+            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
+            resultLauncher.launch(intent)
+            Log.d(tag, resultLauncher.toString())
+
+
+        }
+
+        fun isDeviceOnline(context: Context): Boolean {
+            val connManager =
+                context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+            val networkCapabilities = connManager.getNetworkCapabilities(connManager.activeNetwork)
+            return if (networkCapabilities == null) {
+                println("Device Offline")
+                false
+            } else {
+                true
+            }
+        }
+
+        fun enableDisableUI(enable: Boolean) {
+
+            binding.perms.isEnabled = enable
+            binding.songNameTextBox.isEnabled = enable
+            binding.download.isEnabled = enable
+        }
+        val spotifyApi = SpotifyApi(clientId = CLIENT_ID, clientSecret = CLIENT_SECRET)
+
+
+
+        binding.download.setOnClickListener {
+
+            lifecycleScope.launch(Dispatchers.IO) {
+                runOnUiThread {
+                    enableDisableUI(false)
+                }
+                var songName =""
+                var imgUrl =""
+                var artistName = ""
+                var filename = ""
+                var albumName = ""
+                var albumArtistName = ""
+                var releaseDate = ""
+                var succesCode :Int
+
+
+
+
+                try {
+
+
+                    val textInBox = binding.songNameEditText.text.toString()
+                    val response =  spotifyApi.getSearch(textInBox)
+
+                    val searchResult = response.tracks.items[0]
+                    val regex = Regex("[^A-Za-z0-9]")
+
+
+                    songName = searchResult.name
+                    imgUrl = searchResult.album.images[0].url
+                    artistName = searchResult.artists[0].name
+                    filename = regex.replace(searchResult.name, "")
+                    albumName = searchResult.album.name
+                    albumArtistName = searchResult.album.artists[0].name
+                    releaseDate = searchResult.album.release_date
+                    succesCode = 0
+
+
+                }catch (e:IOException){
+                    Log.e(tag,e.toString())
+
+                    succesCode = 1
+
+
+
+                }catch (e:IllegalArgumentException){
+                    Log.e(tag,e.toString())
+
+                    succesCode = 2
+
+
+                }
+
+
+
+
+
+                    if (isDeviceOnline(context as Activity)&&data!=null&& succesCode== 0){
+                        val dataToBeSent = DataSearch(
+                            songName = songName,
+                            imgUrl = imgUrl,
+                            artistName = artistName,
+                            filename = filename,
+                            albumName = albumName,
+                            albumArtistName = albumArtistName,
+                            releaseDate = releaseDate,
+                            folderUri = data!!.data
+                        )
+                        val action = SongFragmentDirections.actionSongFragmentToSongDownloadFragment(dataToBeSent)
+                        runOnUiThread {
+                            enableDisableUI(true)
+                            navController.navigate(action)
+                        }
+
+
+
+
+
+
+
+                    }else if (succesCode == 1){
+                        runOnUiThread {
+                            Toast.makeText(
+                                context as Activity,
+                                "Connection Error try again later",
+                                Toast.LENGTH_SHORT
+                            ).show()
+                            enableDisableUI(true)
+                        }
+
+
+                    }
+                    else if (succesCode == 2 ) {
+                        runOnUiThread    {
+                            Toast.makeText(
+                                context as Activity, "Invalid Song Name", Toast.LENGTH_SHORT
+                            ).show()
+                            enableDisableUI(true)
+                        }
+                    }
+
+
+                    else if (data == null){
+                        runOnUiThread {
+                            Toast.makeText(
+                                context as Activity, "Please choose a folder", Toast.LENGTH_SHORT
+                            ).show()
+                            enableDisableUI(true)
+                        }
+                    } else {
+                        runOnUiThread {
+                            Toast.makeText(
+                                context as Activity,
+                                "Connection Error try again later",
+                                Toast.LENGTH_SHORT
+                            ).show()
+                            enableDisableUI(true)
+                        }
+                    }
+
+
+
+
+
+
+
+
+
+
+
+
+            }
+        }
+    }
+    private fun Fragment?.runOnUiThread(action: () -> Unit) {
+        this ?: return
+        if (!isAdded) return // Fragment not attached to an Activity
+        activity?.runOnUiThread(action)
+    }
+
+}
+
+
diff --git a/app/src/main/java/com/example/spotifydownloader/albumFragment.kt b/app/src/main/java/com/example/spotifydownloader/Fragments/albumFragment.kt
similarity index 68%
rename from app/src/main/java/com/example/spotifydownloader/albumFragment.kt
rename to app/src/main/java/com/example/spotifydownloader/Fragments/albumFragment.kt
index 9e35895..10be0b2 100644
--- a/app/src/main/java/com/example/spotifydownloader/albumFragment.kt
+++ b/app/src/main/java/com/example/spotifydownloader/Fragments/albumFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spotifydownloader
+package com.example.spotifydownloader.Fragments
 
 import android.app.Activity
 import android.content.Context
@@ -13,14 +13,14 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
-import com.chaquo.python.PyObject
-import com.chaquo.python.Python
-import com.chaquo.python.android.AndroidPlatform
+import com.example.spotifydownloader.R
+import com.example.spotifydownloader.SpotifyApi.SpotifyApi
+import com.example.spotifydownloader.SpotifyApi.util.Constants
 import com.example.spotifydownloader.databinding.FragmentAlbumBinding
 import com.example.spotifydownloader.model.Data
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
+import java.io.IOException
 
 
 class albumFragment : Fragment(R.layout.fragment_album) {
@@ -39,14 +39,8 @@ class albumFragment : Fragment(R.layout.fragment_album) {
         super.onViewCreated(view, savedInstanceState)
         navController = Navigation.findNavController(view)
 
-        if (! Python.isStarted()) {
-            Python.start( AndroidPlatform(context as Activity));
-        }
-
 
 
-        val py = Python.getInstance()
-        val module = py.getModule("main")
         val resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (result.resultCode == Activity.RESULT_OK) {
                 // There are no request codes
@@ -110,22 +104,74 @@ class albumFragment : Fragment(R.layout.fragment_album) {
             runOnUiThread {
                 enableDisableUI(false)
             }
-            //define variables
-            var songNames: List<PyObject>?
+
+            val songNames = mutableListOf<String>()
+            val imgUrls= mutableListOf<String>()
+            val artistNames=mutableListOf<String>()
+            val filenames= mutableListOf<String>()
+            val albumNameS= mutableListOf<String>()
+            val albumArtistNames= mutableListOf<String>()
+            val releaseDates= mutableListOf<String>()
+
+            val regex = Regex("[^A-Za-z0-9]")
+
+
 
             lifecycleScope.launch(Dispatchers.IO) {
 
+
+                val spotifyApi = SpotifyApi(clientId = Constants.CLIENT_ID, clientSecret = Constants.CLIENT_SECRET)
                 val albumLink = binding.PlaylistLinkEditTextAB.text.toString()
-                val response = async { module.callAttr("songSearchSpotifyAlbum", albumLink) }
-                val songs = response.await().asList().toList()
-                songNames = songs[0].asList()
-                val successCode = songs[1].toInt()
-                Log.d(tag, "Songs are $songNames")
-                Log.d(tag, "Code is $successCode")
+                var successCode: Int
+
+
+
+                try {
+
+                    val albumResponse = spotifyApi.getAlbum(albumLink = albumLink)
+
+                    albumResponse.tracks.items.forEach {
+                        songNames.add(it.name)
+                        imgUrls.add(albumResponse.images[0].url)
+                        artistNames.add(albumResponse.artists[0].name)
+                        filenames.add ( regex.replace(it.name, ""))
+                        albumNameS.add(albumResponse.name)
+                        albumArtistNames.add(albumResponse.artists[0].name)
+                        releaseDates.add(albumResponse.release_date)
+
+                    }
+                    successCode = 0
+
+
+                }catch (e: IOException){
+                    Log.e(tag,e.toString())
+                    successCode = 1
+
+
+                }catch (e: NullPointerException) {
+                    Log.e(tag, e.toString())
+                    successCode = 2
+                }
+
+
 
                 if (isDeviceOnline(context as Activity)  && data !=null && successCode == 0) {
 
-                    val data = Data(songNames as MutableList<PyObject>, radioButtonSelection(), data!!.data)
+                    val data = Data(
+                        concurrentDownloads =  radioButtonSelection(),
+                        folderURI = data!!.data,
+                        authToken = spotifyApi.authToken!!,
+                        songNames = songNames,
+                        imgUrls= imgUrls,
+                        artistNames = artistNames,
+                        filenames = filenames,
+                        albumNames = albumNameS,
+                        albumArtistNames = albumArtistNames,
+                        releaseDates = releaseDates,
+                        songCount = songNames.size
+
+
+                    )
                     val action = albumFragmentDirections.actionAlbumFragmentToDownloadFragment(data)
                     runOnUiThread {
                         navController.navigate(action)
diff --git a/app/src/main/java/com/example/spotifydownloader/downloadFragment.kt b/app/src/main/java/com/example/spotifydownloader/Fragments/downloadFragment.kt
similarity index 59%
rename from app/src/main/java/com/example/spotifydownloader/downloadFragment.kt
rename to app/src/main/java/com/example/spotifydownloader/Fragments/downloadFragment.kt
index 18fd342..8f745f5 100644
--- a/app/src/main/java/com/example/spotifydownloader/downloadFragment.kt
+++ b/app/src/main/java/com/example/spotifydownloader/Fragments/downloadFragment.kt
@@ -1,4 +1,4 @@
-package com.example.spotifydownloader
+package com.example.spotifydownloader.Fragments
 
 
 import android.app.Activity
@@ -17,25 +17,24 @@ import androidx.activity.OnBackPressedCallback
 import androidx.core.view.forEach
 import androidx.documentfile.provider.DocumentFile
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.chaquo.python.PyObject
-import com.chaquo.python.Python
-import com.chaquo.python.android.AndroidPlatform
+import com.example.spotifydownloader.R
 import com.example.spotifydownloader.databinding.FragmentDownloadBinding
 import com.example.spotifydownloader.model.recyclerViewAdaptor
 import com.example.spotifydownloader.model.songItemData
+import com.example.spotifydownloader.mp3agic.Mp3File
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.yausername.youtubedl_android.YoutubeDL
 import com.yausername.youtubedl_android.YoutubeDLException
 import com.yausername.youtubedl_android.YoutubeDLRequest
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import org.apache.commons.io.IOUtils
+import java.io.ByteArrayOutputStream
 import java.io.File
+import java.io.IOException
+import java.net.URL
 import java.util.concurrent.Executors
 
 
@@ -45,7 +44,6 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
     private lateinit var bottomNav :BottomNavigationView
     private lateinit var navController: NavController
     private val args by navArgs<downloadFragmentArgs>()
-    private lateinit var module:PyObject
     private var stop = false
     private var songItems = mutableListOf<songItemData>()
     private var completed = 0
@@ -65,22 +63,21 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
         binding = FragmentDownloadBinding.bind(view)
 
 
-        if (! Python.isStarted()) {
-            Python.start( AndroidPlatform(context as Activity))
-        }
         binding.recyclerView.adapter = adapter
         binding.recyclerView.layoutManager = LinearLayoutManager(context)
 
 
         navController =Navigation.findNavController(view)
-        val py = Python.getInstance()
-        module = py.getModule("main")
         var queue = 0
         bottomNav = activity?.findViewById(R.id.bottomNav)!!
 
 
-        val from_top : Animation by lazy { AnimationUtils.loadAnimation((context as Activity),R.anim.from_top) }
-        val from_bottom :Animation by lazy { AnimationUtils.loadAnimation((context as Activity),R.anim.from_bottom) }
+        val from_top : Animation by lazy { AnimationUtils.loadAnimation((context as Activity),
+            R.anim.from_top
+        ) }
+        val from_bottom :Animation by lazy { AnimationUtils.loadAnimation((context as Activity),
+            R.anim.from_bottom
+        ) }
         bottomNav.startAnimation(from_top)
         bottomNav.menu.forEach {
             it.isEnabled = false
@@ -92,6 +89,9 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
 
 
 
+
+
+
         binding.fabButton.setOnClickListener {
             stop = true
             Toast.makeText((context as Activity),"Stopping...",Toast.LENGTH_SHORT).show()
@@ -112,32 +112,30 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
 
 
 
-        if (isDeviceOnline(context as Activity)){
+       val songNames = args.Data.songNames
+        val songNamesSize = args.Data.songCount
 
-            val concurrentThreads = args.Data.concurrentDownloads
-            val executors = Executors.newFixedThreadPool(concurrentThreads)
 
-            val songNamesSize = args.Data.songNames.size
 
 
+        if (isDeviceOnline(context as Activity)){
+
+            val concurrentThreads = args.Data.concurrentDownloads
+            val executors = Executors.newFixedThreadPool(concurrentThreads)
 
 
+            for (i in songNames) {
 
-            for (i in args.Data.songNames as MutableList<PyObject>) {
 
                 val worker = Runnable {
 
                     if (!executors.isShutdown) {
 
-                        val songName = i.toString()
-
-
                         if (!stop) {
 
-
-                                when (download(songName, args.Data.folderURI)) {
+                                when (download(args.Data.folderURI,songNames.indexOf(i))) {
                                     0 -> {
-                                        Log.d(tag,"$completed")
+                                        Log.d(tag, "$completed")
 
                                         if (songNamesSize == completed) {
                                             runOnUiThread {
@@ -158,7 +156,9 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
 
                                         }
                                     }
+
                                     1 -> {
+
                                         if (queue == 0) {
                                             queue += 1
                                             runOnUiThread {
@@ -178,8 +178,10 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
                                             executors.shutdown()
                                         }
                                     }
+
                                     2 -> {
-                                        Log.d(tag,"Completed $completed")
+
+                                        Log.d(tag, "Completed $completed")
                                         if (songNamesSize == completed) {
                                             runOnUiThread {
                                                 Toast.makeText(
@@ -197,7 +199,9 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
                                             }
                                         }
                                     }
+
                                     3 -> {
+
                                         if (queue == 0) {
                                             queue += 1
                                             runOnUiThread {
@@ -220,9 +224,12 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
                                 }
 
 
+
                         }
                         else{
+
                             runOnUiThread {
+
                                 Toast.makeText(
                                     context as Activity,
                                     "Stopped",
@@ -266,165 +273,159 @@ class downloadFragment : Fragment(R.layout.fragment_download) {
             true
         }
     }
-    private fun download(songName: String, data:Uri?): Int {
-
-        try {
-
-
-            val videoInfo = module.callAttr("getDownloadPath", songName).asList().toList()
-
-            val tmpFile = File.createTempFile(
-                "Spotify downloader",
-                null,
-                (context as Activity).externalCacheDir
-            )
-            tmpFile.delete()
-            tmpFile.mkdir()
-            tmpFile.deleteOnExit()
-
-            val filename = videoInfo[0].toString()
-            val ytLInk = videoInfo[1].toString()
-            val imgUrl = videoInfo[2].toString()
-            val code = videoInfo[3].toInt()
-            val artistName = videoInfo[4].toString()
-            val trackName = videoInfo[5].toString()
-
-            val songData = songItemData(imgUrl,trackName,artistName,0)
-            songItems.add(songData)
-            val position = index
-            runOnUiThread {
-                adapter.notifyItemInserted(index)
-                binding.recyclerView.scrollToPosition(position)
-            }
-            index += 1
-
+    private fun download( data:Uri?,arrayPosition:Int): Int {
 
 
 
-            if (code == 0) {
-                try {
 
+        val tmpFile = File.createTempFile(
+            "Spotify downloader",
+            null,
+            (context as Activity).externalCacheDir
+        )
+        tmpFile.delete()
+        tmpFile.mkdir()
+        tmpFile.deleteOnExit()
+        val datas = args.Data
 
-                    val fileLocation = "${tmpFile.absolutePath}/${filename}"
-                    val request = YoutubeDLRequest(ytLInk)
+        val songData = songItemData(datas.imgUrls[arrayPosition],datas.songNames[arrayPosition],datas.artistNames[arrayPosition],0)
+        songItems.add(songData)
+        val position = index
+        runOnUiThread {
+            adapter.notifyItemInserted(index)
+            binding.recyclerView.scrollToPosition(position)
+        }
+        index += 1
 
-                    request.addOption("--output", fileLocation)
-                    request.addOption("--audio-format", "aac")
-                    request.addOption("-x")
-                    request.addOption("--audio-format", "mp3")
-                    request.addOption("-R", "2")
-                    request.addOption("--socket-timeout", "40")
 
-                    val documentFIle: DocumentFile =
-                        DocumentFile.fromTreeUri((context as Activity), data!!)!!
-                    val dc: DocumentFile? = documentFIle.findFile(filename)
 
+        try {
+            val fileLocation = "${tmpFile.absolutePath}/${datas.filenames[arrayPosition]}"
+            val request =   YoutubeDLRequest("ytsearch:${datas.songNames[arrayPosition]} ${datas.artistNames[arrayPosition]}")
 
 
+            request.addOption("--output", "${fileLocation}TMP.mp3")
+            request.addOption("-x")
+            request.addOption("--audio-format", "mp3")
+            request.addOption("-R", "2")
+            request.addOption("--socket-timeout", "40")
+            println(request.buildCommand())
 
 
+            val documentFIle: DocumentFile =
+                DocumentFile.fromTreeUri((context as Activity), data!!)!!
+            val dc: DocumentFile? = documentFIle.findFile("${datas.filenames[arrayPosition]}.mp3")
+            println("${datas.filenames[arrayPosition]}.mp3")
+            if (isDeviceOnline(context as Activity)&& dc?.exists()==null){
 
+                try {
+                    YoutubeDL.getInstance().execute(
+                        request
+                    ) { progress: Float, _: Long, _: String? ->
+                        //Log.d(tag,"Progress is $progress and the song is $songName")
+                        if (progress >0){
+                            songItems[position].progress = progress.toInt()
+                            runOnUiThread {
+                                adapter.notifyItemChanged(position)
+                            }
 
+                        }
 
 
-                    if (isDeviceOnline(context as Activity) && dc?.exists() == null) {
-                        try {
+                    }
 
+                }
+                catch (e: YoutubeDLException) {
+                    Log.e(tag, e.message!!)
+                    tmpFile.deleteRecursively()
+                    return 1
+                }
+                val mp3file = Mp3File("${fileLocation}TMP.mp3")
+                val image :ByteArray?
+                try {
+                    image = getImageBytes(datas.imgUrls[arrayPosition])
+
+                    mp3file.id3v2Tag.setAlbumImage(image,"image/jpeg")
+                    mp3file.id3v2Tag.title = datas.songNames[arrayPosition]
+                    mp3file.id3v2Tag.album = datas.albumNames[arrayPosition]
+                    mp3file.id3v2Tag.albumArtist = datas.albumArtistNames[arrayPosition]
+                    mp3file.id3v2Tag.date = datas.releaseDates[arrayPosition]
+                    mp3file.id3v2Tag.albumArtist = datas.albumArtistNames[arrayPosition]
+                    mp3file.save("$fileLocation.mp3")
+
+                }catch (e:IOException){
+                    return 1
+                }
+                var destUri = data
+                val treeUri = Uri.parse(destUri.toString())
+                val docId = DocumentsContract.getTreeDocumentId(treeUri)
+                val destDir = DocumentsContract.buildDocumentUriUsingTree(treeUri, docId)
+                val fileTempLocation = File("${fileLocation}.mp3")
+                val mimeType =
+                    MimeTypeMap.getSingleton()
+                        .getMimeTypeFromExtension(fileTempLocation.extension) ?: "*/*"
+                destUri = DocumentsContract.createDocument(
+                    (context as Activity).contentResolver,
+                    destDir,
+                    mimeType,
+                    fileTempLocation.name.toString()
+                )
+                val ins = fileTempLocation.inputStream()
+                val ops = (context as Activity).contentResolver.openOutputStream(destUri!!)
+                IOUtils.copy(ins, ops)
+                IOUtils.closeQuietly(ops)
+                IOUtils.closeQuietly(ins)
 
+                }
+            else if (!(isDeviceOnline(context as Activity))) {
+                Log.e(tag, "Connection Error")
+                tmpFile.deleteRecursively()
+                return 1
+            } else {
+                Log.d(tag, "Already exists skipping")
+                tmpFile.deleteRecursively()
+                songItems[position].progress = 100
+                runOnUiThread {
+                    adapter.notifyItemChanged(position)
+                }
+                //binding.progressBar.incrementProgressBy(1)
+                completed += 1
+                return 2
+            }
+            Log.d(tag, "No errors")
+            //binding.progressBar.incrementProgressBy(1)
+            completed += 1
+            tmpFile.deleteRecursively()
+            return 0
+        }catch (e: java.lang.NullPointerException) {
+            tmpFile.deleteRecursively()
+            return 4
+        }
 
 
 
 
-                            YoutubeDL.getInstance().execute(
-                                request
-                            ) { progress: Float, _: Long, _: String? ->
-                                //Log.d(tag,"Progress is $progress and the song is $songName")
-                                if (progress >0){
-                                    songItems[position].progress = progress.toInt()
-                                    runOnUiThread {
-                                        adapter.notifyItemChanged(position)
-                                    }
 
-                                }
 
 
 
-                            }
+    }
 
-                        } catch (e: YoutubeDLException) {
-                            Log.e(tag, e.message!!)
-                            tmpFile.deleteRecursively()
-                            return 1
-                        }
-                        val responseCode =
-                            module.callAttr("insertMetaData", songName, fileLocation).toInt()
-                        var destUri = data
-                        val treeUri = Uri.parse(destUri.toString())
-                        val docId = DocumentsContract.getTreeDocumentId(treeUri)
-                        val destDir = DocumentsContract.buildDocumentUriUsingTree(treeUri, docId)
-                        val fileTempLocation = File(fileLocation)
-                        val mimeType =
-                            MimeTypeMap.getSingleton()
-                                .getMimeTypeFromExtension(fileTempLocation.extension) ?: "*/*"
-                        destUri = DocumentsContract.createDocument(
-                            (context as Activity).contentResolver,
-                            destDir,
-                            mimeType,
-                            fileTempLocation.name.toString()
-                        )
-                        val ins = fileTempLocation.inputStream()
-                        val ops = (context as Activity).contentResolver.openOutputStream(destUri!!)
-                        IOUtils.copy(ins, ops)
-                        IOUtils.closeQuietly(ops)
-                        IOUtils.closeQuietly(ins)
-
-                        if (responseCode == 1) {
-                            Log.e(tag, "Connection Error on insertMetaData")
-                            tmpFile.deleteRecursively()
-                            return responseCode
-                        } else if (responseCode == 2) {
-                            Log.e(tag, "Spotipy name error")
-                            tmpFile.deleteRecursively()
-                            return 3
-                        }
-                    } else if (!(isDeviceOnline(context as Activity))) {
-                        Log.e(tag, "Connection Error")
-                        tmpFile.deleteRecursively()
-                        return 1
-                    } else {
-                        Log.d(tag, "Already exists skipping")
-                        tmpFile.deleteRecursively()
-                        songItems[position].progress = 100
-                        runOnUiThread {
-                            adapter.notifyItemChanged(position)
-                        }
-                        //binding.progressBar.incrementProgressBy(1)
-                        completed += 1
-                        return 2
+        private fun getImageBytes(imageUrl: String): ByteArray? {
+            val url = URL(imageUrl)
+            val output = ByteArrayOutputStream()
+            url.openStream().use { stream ->
+                val buffer = ByteArray(10000)
+                while (true) {
+                    val bytesRead = stream.read(buffer)
+                    if (bytesRead < 0) {
+                        break
                     }
-                    Log.d(tag, "No errors")
-                    //binding.progressBar.incrementProgressBy(1)
-                    completed += 1
-
-                    tmpFile.deleteRecursively()
-                    return 0
-                } catch (e: java.lang.NullPointerException) {
-                    tmpFile.deleteRecursively()
-                    return 4
+                    output.write(buffer, 0, bytesRead)
                 }
-            } else if (code == 1) {
-                Log.e(tag, "Connection error on getDownloadPath")
-                tmpFile.deleteRecursively()
-                return 1
-            } else {
-                Log.e(tag, "Not specified folder")
-                tmpFile.deleteRecursively()
-                return 3
             }
-        }catch (e: java.lang.NullPointerException){
-            return 3
+            return output.toByteArray()
         }
-    }
 }
 
 
diff --git a/app/src/main/java/com/example/spotifydownloader/playListFragment.kt b/app/src/main/java/com/example/spotifydownloader/Fragments/playListFragment.kt
similarity index 56%
rename from app/src/main/java/com/example/spotifydownloader/playListFragment.kt
rename to app/src/main/java/com/example/spotifydownloader/Fragments/playListFragment.kt
index 61d1177..7c7b715 100644
--- a/app/src/main/java/com/example/spotifydownloader/playListFragment.kt
+++ b/app/src/main/java/com/example/spotifydownloader/Fragments/playListFragment.kt
@@ -1,33 +1,27 @@
-package com.example.spotifydownloader
+package com.example.spotifydownloader.Fragments
 
 import android.app.Activity
-import android.app.Application
 import android.content.Context
 import android.content.Intent
 import android.net.ConnectivityManager
 import android.os.Bundle
 import android.util.Log
 import android.view.View
-import android.view.animation.Animation
-import android.view.animation.AnimationUtils
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
-import com.chaquo.python.PyObject
-import com.chaquo.python.Python
-import com.chaquo.python.android.AndroidPlatform
+import com.example.spotifydownloader.R
+import com.example.spotifydownloader.SpotifyApi.SpotifyApi
+import com.example.spotifydownloader.SpotifyApi.util.Constants.Companion.CLIENT_ID
+import com.example.spotifydownloader.SpotifyApi.util.Constants.Companion.CLIENT_SECRET
 import com.example.spotifydownloader.databinding.FragmentPlayListBinding
 import com.example.spotifydownloader.model.Data
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.yausername.ffmpeg.FFmpeg
-import com.yausername.youtubedl_android.YoutubeDL
-import com.yausername.youtubedl_android.YoutubeDLException
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
+import java.io.IOException
 
 
 class playListFragment : Fragment(R.layout.fragment_play_list) {
@@ -44,11 +38,8 @@ class playListFragment : Fragment(R.layout.fragment_play_list) {
 
 
 
-        if (! Python.isStarted()) {
-            Python.start( AndroidPlatform(context as Activity));
-        }
-        val py = Python.getInstance()
-        val module = py.getModule("main")
+
+
 
         val resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (result.resultCode == Activity.RESULT_OK) {
@@ -123,22 +114,100 @@ class playListFragment : Fragment(R.layout.fragment_play_list) {
                 enableDisableUI(false)
             }
             //define variables
-            var songNames: List<PyObject>?
+            val songNames = mutableListOf<String>()
+            val imgUrls= mutableListOf<String>()
+            val artistNames=mutableListOf<String>()
+            val filenames= mutableListOf<String>()
+            val albumNameS= mutableListOf<String>()
+            val albumArtistNames= mutableListOf<String>()
+            val releaseDates= mutableListOf<String>()
+
+            val regex = Regex("[^A-Za-z0-9]")
 
             lifecycleScope.launch(Dispatchers.IO) {
 
+                val spotifyApi = SpotifyApi(clientId = CLIENT_ID, clientSecret = CLIENT_SECRET)
                 val playlistLink = binding.PlaylistLinkEditTextPLF.text.toString()
-                val response = async { module.callAttr("songSearchSpotifyPlaylist", playlistLink) }
-                val songs = response.await().asList().toList()
-                songNames = songs[0].asList()
-                val successCode = songs[1].toInt()
-                Log.d(tag, "Songs are $songNames")
-                Log.d(tag, "Code is $successCode")
+                var successCode: Int
+
+                try {
+                    var offset = 0
+                    var done = true
+
+                    val playlistResponse = spotifyApi.getPlaylist(playlistLink = playlistLink,offset)
+                    playlistResponse.items.forEach {
+                        songNames.add(it.track.name)
+                        imgUrls.add(it.track.album.images[0].url)
+                        artistNames.add(it.track.artists[0].name)
+                        filenames.add ( regex.replace(it.track.name, ""))
+                        albumNameS.add(it.track.album.name)
+                        albumArtistNames.add(it.track.album.artists[0].name)
+                        releaseDates.add(it.track.album.release_date)
+
+                    }
+
+
+                    while (done) {
+                        if (songNames.size >= offset + 100) {
+                            offset +=100
+                            val playlistResponse2 = spotifyApi.getPlaylist(playlistLink = playlistLink,offset)
+                            playlistResponse2.items.forEach {
+                                songNames.add(it.track.name)
+                                imgUrls.add(it.track.album.images[0].url)
+                                artistNames.add(it.track.artists[0].name)
+                                filenames.add ( regex.replace(it.track.name, ""))
+                                albumNameS.add(it.track.album.name)
+                                albumArtistNames.add(it.track.album.artists[0].name)
+                                releaseDates.add(it.track.album.release_date)
+
+                            }
+
+
+                        }
+                        else{
+                            done = false
+                        }
+                    }
+                    successCode = 0
+
+                }catch (e:IOException){
+                    Log.e(tag,e.toString())
+                    successCode = 1
+
+
+                }catch (e:IllegalArgumentException) {
+                    Log.e(tag, e.toString())
+                    successCode = 2
+                }
+
+
+
+
+
+
 
                 if (isDeviceOnline(context as Activity)  && data !=null && successCode == 0) {
 
-                    val data = Data(songNames as MutableList<PyObject>, radioButtonSelection(), data!!.data)
-                    val action = playListFragmentDirections.actionPlayListFragmentToDownloadFragment(data)
+                    val data = Data(
+                        concurrentDownloads =  radioButtonSelection(),
+                        folderURI = data!!.data,
+                        authToken = spotifyApi.authToken!!,
+                        songNames = songNames,
+                        imgUrls= imgUrls,
+                        artistNames = artistNames,
+                        filenames = filenames,
+                        albumNames = albumNameS,
+                        albumArtistNames = albumArtistNames,
+                        releaseDates = releaseDates,
+                        songCount = songNames.size
+
+
+
+
+
+                    )
+                    val action =
+                        playListFragmentDirections.actionPlayListFragmentToDownloadFragment(data)
                     runOnUiThread {
 
                         navController.navigate(action)
@@ -178,6 +247,17 @@ class playListFragment : Fragment(R.layout.fragment_play_list) {
                         enableDisableUI(true)
                     }
                 }
+                else{
+                    runOnUiThread {
+                        Toast.makeText(
+                            context as Activity,
+                            "Connection Error try again later",
+                            Toast.LENGTH_SHORT
+                        ).show()
+                        enableDisableUI(true)
+                    }
+
+                }
             }
             Log.d(tag, "END")
         }
diff --git a/app/src/main/java/com/example/spotifydownloader/MainActivity.kt b/app/src/main/java/com/example/spotifydownloader/MainActivity.kt
index 40187cd..fb81e05 100644
--- a/app/src/main/java/com/example/spotifydownloader/MainActivity.kt
+++ b/app/src/main/java/com/example/spotifydownloader/MainActivity.kt
@@ -7,8 +7,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.GravityCompat
 import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
-import com.chaquo.python.Python
-import com.chaquo.python.android.AndroidPlatform
+
 import com.example.spotifydownloader.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
@@ -35,9 +34,6 @@ class MainActivity : AppCompatActivity() {
 
         bottomNavView.setupWithNavController(navController)
 
-        if (! Python.isStarted()) {
-            Python.start( AndroidPlatform(this))
-        }
 
 
 
diff --git a/app/src/main/java/com/example/spotifydownloader/SongFragment.kt b/app/src/main/java/com/example/spotifydownloader/SongFragment.kt
deleted file mode 100644
index fc1bb85..0000000
--- a/app/src/main/java/com/example/spotifydownloader/SongFragment.kt
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.example.spotifydownloader
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.net.ConnectivityManager
-import android.net.Uri
-import android.os.Bundle
-import android.provider.DocumentsContract
-import android.util.Log
-import android.view.View
-import android.webkit.MimeTypeMap
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.documentfile.provider.DocumentFile
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
-import com.chaquo.python.Python
-import com.chaquo.python.android.AndroidPlatform
-import com.example.spotifydownloader.databinding.FragmentSongBinding
-import com.yausername.youtubedl_android.YoutubeDL
-import com.yausername.youtubedl_android.YoutubeDLException
-import com.yausername.youtubedl_android.YoutubeDLRequest
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.apache.commons.io.IOUtils
-import java.io.File
-
-
-class SongFragment : Fragment(R.layout.fragment_song) {
-    private lateinit var binding: FragmentSongBinding
-    private var data: Intent? = null
-    private val tag = "MainActivity"
-
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        binding = FragmentSongBinding.bind(view)
-        val py = Python.getInstance()
-        val module = py.getModule("main")
-        if (! Python.isStarted()) {
-            Python.start( AndroidPlatform(context as Activity));
-        }
-
-        super.onViewCreated(view, savedInstanceState)
-        val resultLauncher =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                if (result.resultCode == Activity.RESULT_OK) {
-                    // There are no request codes
-                    data = result.data
-                    if (data != null) {
-                        Log.d(tag, data?.data.toString())
-                        Log.d(tag, (context as Activity).externalCacheDir.toString())
-
-                    }
-
-                }
-
-            }
-
-        binding.perms.setOnClickListener {
-            val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
-            resultLauncher.launch(intent)
-            Log.d(tag, resultLauncher.toString())
-
-
-        }
-
-        fun isDeviceOnline(context: Context): Boolean {
-            val connManager =
-                context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-            val networkCapabilities = connManager.getNetworkCapabilities(connManager.activeNetwork)
-            return if (networkCapabilities == null) {
-                println("Device Offline")
-                false
-            } else {
-                true
-            }
-        }
-
-        fun download(songName: String): Int {
-
-
-            val videoInfo = module.callAttr("getDownloadPath", songName).asList().toList()
-
-            val filename = videoInfo[0].toString()
-            val ytLInk = videoInfo[1].toString()
-            val code = videoInfo[2].toInt()
-
-            if (code == 0) {
-
-                val tmpFile = File.createTempFile(
-                    "Spotify downloader", null, (context as Activity).externalCacheDir
-                )
-                tmpFile.delete()
-                tmpFile.mkdir()
-                tmpFile.deleteOnExit()
-                val fileLocation = "${tmpFile.absolutePath}/${filename}"
-
-
-                val request = YoutubeDLRequest(ytLInk)
-
-                request.addOption("--output", fileLocation)
-                request.addOption("--audio-format", "aac")
-                request.addOption("-x")
-                request.addOption("--audio-format", "mp3")
-                request.addOption("-R", "2")
-                request.addOption("--socket-timeout", "40")
-
-
-                val uri = data?.data
-
-                val documentFIle: DocumentFile =
-                    DocumentFile.fromTreeUri((context as Activity), uri!!)!!
-                val dc: DocumentFile? = documentFIle.findFile(filename)
-                Log.d(tag, dc?.exists().toString())
-
-                if (isDeviceOnline(context as Activity) && dc?.exists() == null) {
-                    try {
-
-
-                        YoutubeDL.getInstance().execute(
-                            request
-                        ) { _: Float, _: Long, _: String? -> }
-
-
-                    } catch (e: YoutubeDLException) {
-                        Log.e(tag, "Connection Error")
-                        return 1
-                    }
-
-
-                    val responseCode =
-                        module.callAttr("insertMetaData", songName, fileLocation).toInt()
-
-                    var destUri = data?.data
-                    val treeUri = Uri.parse(destUri.toString())
-                    val docId = DocumentsContract.getTreeDocumentId(treeUri)
-                    val destDir = DocumentsContract.buildDocumentUriUsingTree(treeUri, docId)
-
-
-                    val fileTempLocation = File(fileLocation)
-
-
-                    val mimeType = MimeTypeMap.getSingleton()
-                        .getMimeTypeFromExtension(fileTempLocation.extension) ?: "*/*"
-                    destUri = DocumentsContract.createDocument(
-                        (context as Activity).contentResolver,
-                        destDir,
-                        mimeType,
-                        fileTempLocation.name.toString()
-                    )
-                    val ins = fileTempLocation.inputStream()
-                    val ops = (context as Activity).contentResolver.openOutputStream(destUri!!)
-                    IOUtils.copy(ins, ops)
-                    IOUtils.closeQuietly(ops)
-                    IOUtils.closeQuietly(ins)
-
-                    if (responseCode == 1) {
-                        Log.e(tag, "Connection Error on insertMetaData")
-                        tmpFile.deleteRecursively()
-                        return responseCode
-                    } else if (responseCode == 2) {
-                        Log.e(tag, "Spotipy name error")
-                        tmpFile.deleteRecursively()
-
-                        return 3
-                    }
-
-
-                } else if (!(isDeviceOnline(context as Activity))) {
-                    Log.e(tag, "Connection Error")
-                    tmpFile.deleteRecursively()
-
-                    return 1
-                } else {
-                    Log.d(tag, "Already exists skipping")
-                    tmpFile.deleteRecursively()
-
-                    return 2
-                }
-                Log.d(tag, "No errors")
-                tmpFile.deleteRecursively()
-
-                return 0
-
-
-            } else if (code == 1) {
-                Log.e(tag, "Connection error on getDownloadPath")
-
-                return 1
-            } else {
-                Log.e(tag, "Index error")
-                return 3
-            }
-
-        }
-        fun enableDisableUI(enable: Boolean) {
-
-            binding.perms.isEnabled = enable
-            binding.songNameTextBox.isEnabled = enable
-            binding.download.isEnabled = enable
-        }
-
-
-        binding.download.setOnClickListener {
-
-            lifecycleScope.launch(Dispatchers.IO) {
-
-                val deviceInternet = isDeviceOnline(context as Activity)
-
-                val songName = binding.songNameEditText.text.toString()
-                if (deviceInternet && data != null && songName != "") {
-                    runOnUiThread {
-                        enableDisableUI(false)
-                    }
-                    when (download(songName)) {
-
-                        0 -> {
-                            runOnUiThread {
-                                Toast.makeText(
-                                    context as Activity, "Finished", Toast.LENGTH_SHORT
-                                ).show()
-                                enableDisableUI(true)
-                            }
-
-
-                        }
-                        1 -> {
-                            runOnUiThread {
-                                Toast.makeText(
-                                    context as Activity,
-                                    "Internet Connection Error",
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                                enableDisableUI(true)
-                            }
-
-                        }
-                        2 -> {
-                            runOnUiThread {
-                                Toast.makeText(
-                                    context as Activity, "Already downloaded", Toast.LENGTH_SHORT
-                                ).show()
-                                enableDisableUI(true)
-                            }
-
-                        }
-                        3 -> {
-                            runOnUiThread {
-                                Toast.makeText(
-                                    context as Activity,
-                                    "Please Insert a valid song name",
-                                    Toast.LENGTH_SHORT
-                                ).show()
-                                enableDisableUI(true)
-                            }
-
-                        }
-
-                    }
-
-
-                } else if (data == null) {
-                    runOnUiThread {
-                        Toast.makeText(
-                            context as Activity, "Please choose a folder", Toast.LENGTH_SHORT
-                        ).show()
-                    }
-
-                } else if (songName == "") {
-                    runOnUiThread {
-                        Toast.makeText(
-                            context as Activity,
-                            "Please Insert a valid song name",
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    }
-
-
-                } else {
-                    runOnUiThread {
-                        Toast.makeText(
-                            context as Activity,
-                            "Connection Error try again later",
-                            Toast.LENGTH_SHORT
-                        ).show()
-                    }
-                }
-            }
-        }
-    }
-    private fun Fragment?.runOnUiThread(action: () -> Unit) {
-        this ?: return
-        if (!isAdded) return // Fragment not attached to an Activity
-        activity?.runOnUiThread(action)
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/SpotifyApi.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/SpotifyApi.kt
new file mode 100644
index 0000000..dd5c36e
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/SpotifyApi.kt
@@ -0,0 +1,325 @@
+package com.example.spotifydownloader.SpotifyApi
+
+import android.util.Log
+import com.example.spotifydownloader.SpotifyApi.api.RetrofitApiInstance
+import com.example.spotifydownloader.SpotifyApi.api.RetrofitAuthInstance
+import com.example.spotifydownloader.SpotifyApi.model.Album.Album
+import com.example.spotifydownloader.SpotifyApi.model.Artist.Artist
+import com.example.spotifydownloader.SpotifyApi.model.ExtractIdResponse
+import com.example.spotifydownloader.SpotifyApi.model.Search.Search
+import com.example.spotifydownloader.SpotifyApi.model.Track.Track
+import com.example.spotifydownloader.SpotifyApi.model.playlist.Playlist
+import retrofit2.HttpException
+import java.io.IOException
+
+class SpotifyApi(private val clientId: String, private val clientSecret: String, var authToken:String? = null){
+
+    private val tag = "MainActivity"
+    private suspend fun getAuthTokenOrRefresh(clientId: String,clientSecret: String){
+
+
+
+        try {
+            val response = RetrofitAuthInstance.apiAuth.getAuthenticationToken(
+                grant_type = "client_credentials",
+                client_id = clientId,
+                client_secret = clientSecret
+            )
+            if (response.isSuccessful && response.body() != null ){
+                Log.d(tag,response.body()!!.access_token)
+                authToken = response.body()!!.access_token
+            }
+            else{
+                throw error("Unexpected Response")
+
+            }
+
+        }catch (e: IOException){
+            throw IOException("No Internet Connection")
+
+
+        }catch (e: HttpException){
+            throw error("Unexpected Response")
+        }
+
+    }
+
+    suspend fun getAlbum(albumLink:String): Album {
+
+
+
+        if (authToken == null){
+            getAuthTokenOrRefresh(
+                clientId = clientId,
+                clientSecret = clientSecret
+            )
+        }
+
+        val link = extractId(albumLink)
+        if ((link.type != "album" )){
+            throw IllegalArgumentException("The link isn't an album type ")
+        }
+        try {
+
+
+            val response = RetrofitApiInstance.api.getAlbum(
+                albumId = link.id,
+                headers = mapOf("Authorization" to "Bearer  $authToken")
+            )
+            return response.body()!!
+        }
+        catch (e: IOException){
+            throw IOException("No Internet Connection")
+        }
+        catch (e:NullPointerException){
+            getAuthTokenOrRefresh(
+                clientId = clientId,
+                clientSecret = clientSecret
+            )
+            try {
+                val response = RetrofitApiInstance.api.getAlbum(
+                    albumId = link.id,
+                    headers = mapOf("Authorization" to "Bearer  $authToken")
+                )
+                return response.body()!!
+            }
+            catch (e: IOException){
+                throw IOException("No Internet Connection")
+            }
+            catch (e:NullPointerException){
+                throw error("Invalid Id")
+            }
+        }
+    }
+    suspend fun getArtist(artistLink:String):Artist{
+
+
+
+        if (authToken == null){
+            getAuthTokenOrRefresh(
+                clientId = clientId,
+                clientSecret = clientSecret
+            )
+        }
+
+        val link = extractId(artistLink)
+        if ((link.type != "artist" )){
+            throw IllegalArgumentException("The link isn't an artist type ")
+        }
+        try {
+
+
+            val response = RetrofitApiInstance.api.getArtist(
+                artistId = link.id,
+                headers = mapOf("Authorization" to "Bearer  $authToken")
+            )
+            return response.body()!!
+        }
+        catch (e: IOException){
+            throw IOException("No Internet Connection")
+        }
+        catch (e:NullPointerException){
+            getAuthTokenOrRefresh(
+                clientId = clientId,
+                clientSecret = clientSecret
+            )
+            try {
+                val response = RetrofitApiInstance.api.getArtist(
+                    artistId = link.id,
+                    headers = mapOf("Authorization" to "Bearer  $authToken")
+                )
+                return response.body()!!
+            }
+            catch (e: IOException){
+                throw IOException("No Internet Connection")
+            }
+            catch (e:NullPointerException){
+                throw error("Invalid Id")
+            }
+        }
+    }
+    suspend fun getTrack(trackId:String):Track{
+
+
+
+        if (authToken == null){
+            getAuthTokenOrRefresh(
+                clientId = clientId,
+                clientSecret = clientSecret
+            )
+        }
+
+        val link = extractId(trackId)
+        if ((link.type != "track" )){
+            throw IllegalArgumentException("The link isn't an track type ")
+        }
+        try {
+
+
+            val response = RetrofitApiInstance.api.getTrack(
+                trackId = link.id,
+                headers = mapOf("Authorization" to "Bearer  $authToken")
+            )
+            return response.body()!!
+        }
+        catch (e: IOException){
+            throw IOException("No Internet Connection")
+        }
+        catch (e:NullPointerException){
+            getAuthTokenOrRefresh(
+                clientId = clientId,
+                clientSecret = clientSecret
+            )
+            try {
+                val response = RetrofitApiInstance.api.getTrack(
+                    trackId = link.id,
+                    headers = mapOf("Authorization" to "Bearer  $authToken")
+                )
+                return response.body()!!
+            }
+            catch (e: IOException){
+                throw IOException("No Internet Connection")
+            }
+            catch (e:NullPointerException){
+                throw error("Invalid Id")
+            }
+        }
+    }
+    suspend fun getPlaylist(playlistLink:String,offset:Int):Playlist{
+
+
+
+        if (authToken == null){
+            getAuthTokenOrRefresh(
+                clientId = clientId,
+                clientSecret = clientSecret
+            )
+        }
+
+        val link = extractId(playlistLink)
+        if ((link.type != "playlist" )){
+            throw IllegalArgumentException("The link isn't a playlist type ")
+        }
+        try {
+
+
+            val response = RetrofitApiInstance.api.getPlaylist(
+                playListId = link.id,
+                headers = mapOf("Authorization" to "Bearer  $authToken"),
+                offset = offset
+            )
+            return response.body()!!
+        }
+        catch (e: IOException){
+            throw IOException("No Internet Connection")
+        }
+        catch (e:NullPointerException){
+            getAuthTokenOrRefresh(
+                clientId = clientId,
+                clientSecret = clientSecret
+            )
+            try {
+                val response = RetrofitApiInstance.api.getPlaylist(
+                    playListId = link.id,
+                    headers = mapOf("Authorization" to "Bearer  $authToken"),
+                    offset = offset
+                )
+
+
+
+
+
+                return response.body()!!
+            }
+            catch (e: IOException){
+                throw IOException("No Internet Connection")
+            }
+            catch (e:NullPointerException){
+                throw IllegalArgumentException("Invalid Id")
+            }
+        }
+    }
+
+
+    suspend fun getSearch(query:String):Search{
+        if (authToken == null){
+            getAuthTokenOrRefresh(
+                clientId = clientId,
+                clientSecret = clientSecret
+            )
+        }
+        try {
+
+
+            val response = RetrofitApiInstance.api.getSearch(
+                searchQuery = query,
+                headers = mapOf("Authorization" to "Bearer  $authToken"),
+            )
+            return response.body()!!
+        }
+        catch (e: IOException){
+            throw IOException("No Internet Connection")
+        }
+        catch (e:NullPointerException){
+            getAuthTokenOrRefresh(
+                clientId = clientId,
+                clientSecret = clientSecret
+            )
+            try {
+                val response = RetrofitApiInstance.api.getSearch(
+                    searchQuery = query,
+                    headers = mapOf("Authorization" to "Bearer  $authToken")
+                )
+                return response.body()!!
+            }
+            catch (e: IOException){
+                throw IOException("No Internet Connection")
+            }
+            catch (e:NullPointerException){
+                throw IllegalArgumentException("Invalid Search")
+            }
+        }
+
+
+
+
+
+
+
+
+    }
+
+
+
+    private fun extractId(link:String): ExtractIdResponse {
+        if (link.contains("/track/")) {
+            val id = link.substringAfter("/track/").substringBefore("?")
+            val data = ExtractIdResponse(id,"track")
+            return data
+
+        }
+        else if(link.contains("/playlist/")) {
+            val id = link.substringAfter("/playlist/").substringBefore("?")
+            val data = ExtractIdResponse(id,"playlist")
+            return data
+
+        }
+        else if (link.contains("/artist/")) {
+            val id = link.substringAfter("/artist/").substringBefore("?")
+            val data = ExtractIdResponse(id,"artist")
+            return data
+
+        }
+        else if (link.contains("/album/")) {
+            val id = link.substringAfter("/album/").substringBefore("?")
+            val data = ExtractIdResponse(id,"album")
+            return data
+
+        }
+        else{
+            throw IllegalArgumentException("Link is invalid")
+
+        }
+
+    }
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/AuthApi.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/AuthApi.kt
new file mode 100644
index 0000000..177d394
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/AuthApi.kt
@@ -0,0 +1,17 @@
+package com.example.spotifydownloader.SpotifyApi.api
+
+import com.example.spotifydownloader.SpotifyApi.model.ApiToken
+import retrofit2.Response
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.POST
+
+interface AuthApi {
+
+    @POST("/api/token")
+    @FormUrlEncoded
+    suspend fun getAuthenticationToken(@Field("grant_type") grant_type :String,
+                                       @Field("client_id")client_id:String,
+                                       @Field("client_secret") client_secret: String) :
+            Response<ApiToken>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/RetrofitApiInstance.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/RetrofitApiInstance.kt
new file mode 100644
index 0000000..185c693
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/RetrofitApiInstance.kt
@@ -0,0 +1,18 @@
+package com.example.spotifydownloader.SpotifyApi.api
+
+import com.example.spotifydownloader.SpotifyApi.util.Constants
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+object RetrofitApiInstance {
+
+    private val retrofitApi by lazy {
+        Retrofit.Builder()
+            .baseUrl(Constants.BASE_URL_SPOTIFY)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+    val api: SpotifyAPI by lazy {
+        retrofitApi.create(SpotifyAPI::class.java)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/RetrofitAuthInstance.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/RetrofitAuthInstance.kt
new file mode 100644
index 0000000..3756492
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/RetrofitAuthInstance.kt
@@ -0,0 +1,22 @@
+package com.example.spotifydownloader.SpotifyApi.api
+
+import com.example.spotifydownloader.SpotifyApi.util.Constants.Companion.AUTH_URL
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+object RetrofitAuthInstance {
+
+    private val retrofitAuth by lazy {
+        Retrofit.Builder()
+            .baseUrl(AUTH_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+
+
+    }
+    val apiAuth : AuthApi by lazy {
+
+        retrofitAuth.create(AuthApi::class.java)
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/SpotifyAPI.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/SpotifyAPI.kt
new file mode 100644
index 0000000..66edf85
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/api/SpotifyAPI.kt
@@ -0,0 +1,52 @@
+package com.example.spotifydownloader.SpotifyApi.api
+
+import com.example.spotifydownloader.SpotifyApi.model.Album.Album
+import com.example.spotifydownloader.SpotifyApi.model.Artist.Artist
+import com.example.spotifydownloader.SpotifyApi.model.Search.Search
+import com.example.spotifydownloader.SpotifyApi.model.Track.Track
+import com.example.spotifydownloader.SpotifyApi.model.playlist.Playlist
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.HeaderMap
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface SpotifyAPI {
+    @GET("artists/{artistID}")
+    suspend fun getArtist(
+        @Path("artistID") artistId:String,
+        @HeaderMap headers: Map<String, String>
+    ): Response<Artist>
+
+    @GET("tracks/{trackId}")
+    suspend fun getTrack(
+        @Path("trackId") trackId:String,
+        @HeaderMap headers: Map<String, String>
+    ): Response<Track>
+
+    @GET("albums/{albumId}")
+    suspend fun getAlbum(
+        @Path("albumId") albumId: String,
+        @HeaderMap headers: Map<String, String>
+    ): Response<Album>
+
+    @GET("playlists/{playlistId}/tracks")
+    suspend fun getPlaylist(
+        @Path("playlistId") playListId: String,
+        @HeaderMap headers: Map<String,String>,
+        @Query("offset") offset:Int
+    ): Response<Playlist>
+
+
+    @GET("search")
+    suspend fun getSearch(
+        @HeaderMap headers: Map<String,String>,
+        @Query("q") searchQuery:String,
+        @Query("type")type:String = "track",
+        @Query("limit")limit:Int = 1
+
+
+    ):Response<Search>
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Album.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Album.kt
new file mode 100644
index 0000000..2a534ea
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Album.kt
@@ -0,0 +1,23 @@
+package com.example.spotifydownloader.SpotifyApi.model.Album
+
+data class Album(
+    val album_group: String,
+    val album_type: String,
+    val artists: List<Artist>,
+    val copyrights: List<Copyright>,
+    val external_ids: ExternalIds,
+    val external_urls: ExternalUrlsX,
+    val genres: List<Any>,
+    val href: String,
+    val id: String,
+    val images: List<Image>,
+    val label: String,
+    val name: String,
+    val popularity: Int,
+    val release_date: String,
+    val release_date_precision: String,
+    val total_tracks: Int,
+    val tracks: Tracks,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Artist.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Artist.kt
new file mode 100644
index 0000000..aa0d8d3
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Artist.kt
@@ -0,0 +1,10 @@
+package com.example.spotifydownloader.SpotifyApi.model.Album
+
+data class Artist(
+    val external_urls: ExternalUrlsX,
+    val href: String,
+    val id: String,
+    val name: String,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Copyright.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Copyright.kt
new file mode 100644
index 0000000..f2a90e5
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Copyright.kt
@@ -0,0 +1,6 @@
+package com.example.spotifydownloader.SpotifyApi.model.Album
+
+data class Copyright(
+    val text: String,
+    val type: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/ExternalIds.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/ExternalIds.kt
new file mode 100644
index 0000000..ad789da
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/ExternalIds.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.Album
+
+data class ExternalIds(
+    val upc: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/ExternalUrlsX.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/ExternalUrlsX.kt
new file mode 100644
index 0000000..93fbc1e
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/ExternalUrlsX.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.Album
+
+data class ExternalUrlsX(
+    val spotify: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Image.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Image.kt
new file mode 100644
index 0000000..6cfc82a
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Image.kt
@@ -0,0 +1,7 @@
+package com.example.spotifydownloader.SpotifyApi.model.Album
+
+data class Image(
+    val height: Int,
+    val url: String,
+    val width: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Item.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Item.kt
new file mode 100644
index 0000000..1706ae2
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Item.kt
@@ -0,0 +1,17 @@
+package com.example.spotifydownloader.SpotifyApi.model.Album
+
+data class Item(
+    val artists: List<Artist>,
+    val disc_number: Int,
+    val duration_ms: Int,
+    val explicit: Boolean,
+    val external_urls: ExternalUrlsX,
+    val href: String,
+    val id: String,
+    val is_local: Boolean,
+    val name: String,
+    val preview_url: Any,
+    val track_number: Int,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Tracks.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Tracks.kt
new file mode 100644
index 0000000..53ac58e
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Album/Tracks.kt
@@ -0,0 +1,11 @@
+package com.example.spotifydownloader.SpotifyApi.model.Album
+
+data class Tracks(
+    val href: String,
+    val items: List<Item>,
+    val limit: Int,
+    val next: Any,
+    val offset: Int,
+    val previous: Any,
+    val total: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/ApiToken.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/ApiToken.kt
new file mode 100644
index 0000000..e5bfebb
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/ApiToken.kt
@@ -0,0 +1,10 @@
+package com.example.spotifydownloader.SpotifyApi.model
+
+
+data class ApiToken (
+        val access_token :String,
+        val token_type :String,
+        val expires_in : Int,
+
+        )
+
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/Artist.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/Artist.kt
new file mode 100644
index 0000000..b450d7b
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/Artist.kt
@@ -0,0 +1,14 @@
+package com.example.spotifydownloader.SpotifyApi.model.Artist
+
+data class Artist(
+    val external_urls: ExternalUrls,
+    val followers: Followers,
+    val genres: List<String>,
+    val href: String,
+    val id: String,
+    val images: List<Image>,
+    val name: String,
+    val popularity: Int,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/ExternalUrls.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/ExternalUrls.kt
new file mode 100644
index 0000000..d1508eb
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/ExternalUrls.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.Artist
+
+data class ExternalUrls(
+    val spotify: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/Followers.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/Followers.kt
new file mode 100644
index 0000000..59e15c1
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/Followers.kt
@@ -0,0 +1,6 @@
+package com.example.spotifydownloader.SpotifyApi.model.Artist
+
+data class Followers(
+    val href: Any,
+    val total: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/Image.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/Image.kt
new file mode 100644
index 0000000..2ce8f07
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Artist/Image.kt
@@ -0,0 +1,7 @@
+package com.example.spotifydownloader.SpotifyApi.model.Artist
+
+data class Image(
+    val height: Int,
+    val url: String,
+    val width: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/ExtractIdResponse.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/ExtractIdResponse.kt
new file mode 100644
index 0000000..c3aa0e8
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/ExtractIdResponse.kt
@@ -0,0 +1,7 @@
+package com.example.spotifydownloader.SpotifyApi.model
+
+data class ExtractIdResponse(
+
+    val id:String,
+    val type:String
+)
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Album.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Album.kt
new file mode 100644
index 0000000..b2061e3
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Album.kt
@@ -0,0 +1,17 @@
+package com.example.spotifydownloader.SpotifyApi.model.Search
+
+data class Album(
+    val album_group: String,
+    val album_type: String,
+    val artists: List<ArtistX>,
+    val external_urls: ExternalUrlsXXX,
+    val href: String,
+    val id: String,
+    val images: List<Image>,
+    val name: String,
+    val release_date: String,
+    val release_date_precision: String,
+    val total_tracks: Int,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/ArtistX.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/ArtistX.kt
new file mode 100644
index 0000000..82f0ef2
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/ArtistX.kt
@@ -0,0 +1,10 @@
+package com.example.spotifydownloader.SpotifyApi.model.Search
+
+data class ArtistX(
+    val external_urls: ExternalUrlsXXX,
+    val href: String,
+    val id: String,
+    val name: String,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/ExternalIds.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/ExternalIds.kt
new file mode 100644
index 0000000..db3b843
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/ExternalIds.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.Search
+
+data class ExternalIds(
+    val isrc: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/ExternalUrlsXXX.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/ExternalUrlsXXX.kt
new file mode 100644
index 0000000..adcdfb3
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/ExternalUrlsXXX.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.Search
+
+data class ExternalUrlsXXX(
+    val spotify: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Image.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Image.kt
new file mode 100644
index 0000000..2a7585d
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Image.kt
@@ -0,0 +1,7 @@
+package com.example.spotifydownloader.SpotifyApi.model.Search
+
+data class Image(
+    val height: Int,
+    val url: String,
+    val width: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Item.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Item.kt
new file mode 100644
index 0000000..0dc0971
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Item.kt
@@ -0,0 +1,20 @@
+package com.example.spotifydownloader.SpotifyApi.model.Search
+
+data class Item(
+    val album: Album,
+    val artists: List<ArtistX>,
+    val disc_number: Int,
+    val duration_ms: Int,
+    val explicit: Boolean,
+    val external_ids: ExternalIds,
+    val external_urls: ExternalUrlsXXX,
+    val href: String,
+    val id: String,
+    val is_local: Boolean,
+    val name: String,
+    val popularity: Int,
+    val preview_url: String,
+    val track_number: Int,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Search.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Search.kt
new file mode 100644
index 0000000..eb3b551
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Search.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.Search
+
+data class Search(
+    val tracks: Tracks
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Tracks.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Tracks.kt
new file mode 100644
index 0000000..73179b0
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Search/Tracks.kt
@@ -0,0 +1,11 @@
+package com.example.spotifydownloader.SpotifyApi.model.Search
+
+data class Tracks(
+    val href: String,
+    val items: List<Item>,
+    val limit: Int,
+    val next: String,
+    val offset: Int,
+    val previous: Any,
+    val total: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/Album.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/Album.kt
new file mode 100644
index 0000000..e5435f5
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/Album.kt
@@ -0,0 +1,17 @@
+package com.example.spotifydownloader.SpotifyApi.model.Track
+
+data class Album(
+    val album_group: String,
+    val album_type: String,
+    val artists: List<ArtistX>,
+    val external_urls: ExternalUrlsXXX,
+    val href: String,
+    val id: String,
+    val images: List<Image>,
+    val name: String,
+    val release_date: String,
+    val release_date_precision: String,
+    val total_tracks: Int,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/ArtistX.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/ArtistX.kt
new file mode 100644
index 0000000..aa7b87f
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/ArtistX.kt
@@ -0,0 +1,10 @@
+package com.example.spotifydownloader.SpotifyApi.model.Track
+
+data class ArtistX(
+    val external_urls: ExternalUrlsXXX,
+    val href: String,
+    val id: String,
+    val name: String,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/ExternalIds.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/ExternalIds.kt
new file mode 100644
index 0000000..8ff8939
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/ExternalIds.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.Track
+
+data class ExternalIds(
+    val isrc: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/ExternalUrlsXXX.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/ExternalUrlsXXX.kt
new file mode 100644
index 0000000..1180529
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/ExternalUrlsXXX.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.Track
+
+data class ExternalUrlsXXX(
+    val spotify: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/Image.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/Image.kt
new file mode 100644
index 0000000..a2ae1e2
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/Image.kt
@@ -0,0 +1,7 @@
+package com.example.spotifydownloader.SpotifyApi.model.Track
+
+data class Image(
+    val height: Int,
+    val url: String,
+    val width: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/Track.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/Track.kt
new file mode 100644
index 0000000..314fa27
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/Track/Track.kt
@@ -0,0 +1,20 @@
+package com.example.spotifydownloader.SpotifyApi.model.Track
+
+data class Track(
+    val album: Album,
+    val artists: List<ArtistX>,
+    val disc_number: Int,
+    val duration_ms: Int,
+    val explicit: Boolean,
+    val external_ids: ExternalIds,
+    val external_urls: ExternalUrlsXXX,
+    val href: String,
+    val id: String,
+    val is_local: Boolean,
+    val name: String,
+    val popularity: Int,
+    val preview_url: Any,
+    val track_number: Int,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/AddedBy.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/AddedBy.kt
new file mode 100644
index 0000000..b2904f5
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/AddedBy.kt
@@ -0,0 +1,9 @@
+package com.example.spotifydownloader.SpotifyApi.model.playlist
+
+data class AddedBy(
+    val external_urls: ExternalUrls,
+    val href: String,
+    val id: String,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Album.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Album.kt
new file mode 100644
index 0000000..0c9ba3e
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Album.kt
@@ -0,0 +1,17 @@
+package com.example.spotifydownloader.SpotifyApi.model.playlist
+
+data class Album(
+    val album_group: String,
+    val album_type: String,
+    val artists: List<ArtistX>,
+    val external_urls: ExternalUrls,
+    val href: String,
+    val id: String,
+    val images: List<Image>,
+    val name: String,
+    val release_date: String,
+    val release_date_precision: String,
+    val total_tracks: Int,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/ArtistX.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/ArtistX.kt
new file mode 100644
index 0000000..4062b66
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/ArtistX.kt
@@ -0,0 +1,10 @@
+package com.example.spotifydownloader.SpotifyApi.model.playlist
+
+data class ArtistX(
+    val external_urls: ExternalUrls,
+    val href: String,
+    val id: String,
+    val name: String,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/ExternalIds.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/ExternalIds.kt
new file mode 100644
index 0000000..c31f88d
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/ExternalIds.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.playlist
+
+data class ExternalIds(
+    val isrc: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/ExternalUrls.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/ExternalUrls.kt
new file mode 100644
index 0000000..2b6642c
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/ExternalUrls.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.playlist
+
+data class ExternalUrls(
+    val spotify: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Image.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Image.kt
new file mode 100644
index 0000000..91f3b6d
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Image.kt
@@ -0,0 +1,7 @@
+package com.example.spotifydownloader.SpotifyApi.model.playlist
+
+data class Image(
+    val height: Int,
+    val url: String,
+    val width: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Item.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Item.kt
new file mode 100644
index 0000000..fe17fa8
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Item.kt
@@ -0,0 +1,10 @@
+package com.example.spotifydownloader.SpotifyApi.model.playlist
+
+data class Item(
+    val added_at: String,
+    val added_by: AddedBy,
+    val is_local: Boolean,
+    val primary_color: Any,
+    val track: Track,
+    val video_thumbnail: VideoThumbnail
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Playlist.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Playlist.kt
new file mode 100644
index 0000000..b39f09f
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Playlist.kt
@@ -0,0 +1,11 @@
+package com.example.spotifydownloader.SpotifyApi.model.playlist
+
+data class Playlist(
+    val href: String,
+    val items: List<Item>,
+    val limit: Int,
+    val next: Any,
+    val offset: Int,
+    val previous: Any,
+    val total: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Track.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Track.kt
new file mode 100644
index 0000000..4f68413
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/Track.kt
@@ -0,0 +1,22 @@
+package com.example.spotifydownloader.SpotifyApi.model.playlist
+
+data class Track(
+    val album: Album,
+    val artists: List<ArtistX>,
+    val disc_number: Int,
+    val duration_ms: Int,
+    val episode: Boolean,
+    val explicit: Boolean,
+    val external_ids: ExternalIds,
+    val external_urls: ExternalUrls,
+    val href: String,
+    val id: String,
+    val is_local: Boolean,
+    val name: String,
+    val popularity: Int,
+    val preview_url: String,
+    val track: Boolean,
+    val track_number: Int,
+    val type: String,
+    val uri: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/VideoThumbnail.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/VideoThumbnail.kt
new file mode 100644
index 0000000..754a3cb
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/model/playlist/VideoThumbnail.kt
@@ -0,0 +1,5 @@
+package com.example.spotifydownloader.SpotifyApi.model.playlist
+
+data class VideoThumbnail(
+    val url: Any
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/SpotifyApi/util/Constants.kt b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/util/Constants.kt
new file mode 100644
index 0000000..5b8aefb
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/SpotifyApi/util/Constants.kt
@@ -0,0 +1,14 @@
+package com.example.spotifydownloader.SpotifyApi.util
+
+class Constants {
+
+    companion object{
+        const val CLIENT_ID = "839761bd027c48d8bdfc23f0efcd4a11"
+        const val CLIENT_SECRET = "7a06c728f0ad41298754f159242fb914"
+        const val AUTH_URL = "https://accounts.spotify.com/"
+        const val BASE_URL_SPOTIFY = "https://api.spotify.com/v1/"
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/spotifydownloader/model/Data.kt b/app/src/main/java/com/example/spotifydownloader/model/Data.kt
index b92c622..a748316 100644
--- a/app/src/main/java/com/example/spotifydownloader/model/Data.kt
+++ b/app/src/main/java/com/example/spotifydownloader/model/Data.kt
@@ -1,16 +1,25 @@
 package com.example.spotifydownloader.model
 
+
 import android.net.Uri
 import android.os.Parcelable
-import com.chaquo.python.PyObject
 import kotlinx.parcelize.Parcelize
-import kotlinx.parcelize.RawValue
+
 
 @Parcelize
 data class Data(
-    val songNames:@RawValue List<PyObject>,
     val concurrentDownloads: Int,
-    val folderURI: Uri?
+    val folderURI: Uri?,
+    val authToken:String,
+    val songNames:List<String>,
+    val imgUrls:List<String>,
+    val artistNames:List<String>,
+    val filenames:List<String>,
+    val albumNames:List<String>,
+    val albumArtistNames:List<String>,
+    val releaseDates:List<String>,
+    val songCount:Int
+
 
 ):Parcelable
 
diff --git a/app/src/main/java/com/example/spotifydownloader/model/DataSearch.kt b/app/src/main/java/com/example/spotifydownloader/model/DataSearch.kt
new file mode 100644
index 0000000..8aa4d01
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/model/DataSearch.kt
@@ -0,0 +1,22 @@
+package com.example.spotifydownloader.model
+
+import android.net.Uri
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+
+@Parcelize
+data class DataSearch(
+
+    val songName:String,
+    val imgUrl:String,
+    val artistName:String,
+    val filename:String,
+    val albumName:String,
+    val albumArtistName:String,
+    val releaseDate:String,
+    val folderUri: Uri?
+
+
+
+) : Parcelable
diff --git a/app/src/main/java/com/example/spotifydownloader/model/songItemData.kt b/app/src/main/java/com/example/spotifydownloader/model/songItemData.kt
index ecabb36..b38ff26 100644
--- a/app/src/main/java/com/example/spotifydownloader/model/songItemData.kt
+++ b/app/src/main/java/com/example/spotifydownloader/model/songItemData.kt
@@ -1,6 +1,5 @@
 package com.example.spotifydownloader.model
 
-import android.graphics.Bitmap
 
 data class songItemData(val imageUrl : String,
                         val songName: String,
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/AbstractID3v2FrameData.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/AbstractID3v2FrameData.java
new file mode 100644
index 0000000..31fc617
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/AbstractID3v2FrameData.java
@@ -0,0 +1,59 @@
+package com.example.spotifydownloader.mp3agic;
+
+public abstract class AbstractID3v2FrameData {
+
+	boolean unsynchronisation;
+
+	public AbstractID3v2FrameData(boolean unsynchronisation) {
+		this.unsynchronisation = unsynchronisation;
+	}
+
+	protected final void synchroniseAndUnpackFrameData(byte[] bytes) throws InvalidDataException {
+		if (unsynchronisation && BufferTools.sizeSynchronisationWouldSubtract(bytes) > 0) {
+			byte[] synchronisedBytes = BufferTools.synchroniseBuffer(bytes);
+			unpackFrameData(synchronisedBytes);
+		} else {
+			unpackFrameData(bytes);
+		}
+	}
+
+	protected byte[] packAndUnsynchroniseFrameData() {
+		byte[] bytes = packFrameData();
+		if (unsynchronisation && BufferTools.sizeUnsynchronisationWouldAdd(bytes) > 0) {
+			return BufferTools.unsynchroniseBuffer(bytes);
+		}
+		return bytes;
+	}
+
+	protected byte[] toBytes() {
+		return packAndUnsynchroniseFrameData();
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + (unsynchronisation ? 1231 : 1237);
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AbstractID3v2FrameData other = (AbstractID3v2FrameData) obj;
+		if (unsynchronisation != other.unsynchronisation)
+			return false;
+		return true;
+	}
+
+	protected abstract void unpackFrameData(byte[] bytes) throws InvalidDataException;
+
+	protected abstract byte[] packFrameData();
+
+	protected abstract int getLength();
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/AbstractID3v2Tag.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/AbstractID3v2Tag.java
new file mode 100644
index 0000000..83ab58e
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/AbstractID3v2Tag.java
@@ -0,0 +1,1251 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+public abstract class AbstractID3v2Tag implements ID3v2 {
+
+	public static final String ID_IMAGE = "APIC";
+	public static final String ID_ENCODER = "TENC";
+	public static final String ID_URL = "WXXX";
+	public static final String ID_ARTIST_URL = "WOAR";
+	public static final String ID_COMMERCIAL_URL = "WCOM";
+	public static final String ID_COPYRIGHT_URL = "WCOP";
+	public static final String ID_AUDIOFILE_URL = "WOAF";
+	public static final String ID_AUDIOSOURCE_URL = "WOAS";
+	public static final String ID_RADIOSTATION_URL = "WORS";
+	public static final String ID_PAYMENT_URL = "WPAY";
+	public static final String ID_PUBLISHER_URL = "WPUB";
+	public static final String ID_COPYRIGHT = "TCOP";
+	public static final String ID_ORIGINAL_ARTIST = "TOPE";
+	public static final String ID_BPM = "TBPM";
+	public static final String ID_COMPOSER = "TCOM";
+	public static final String ID_PUBLISHER = "TPUB";
+	public static final String ID_COMMENT = "COMM";
+	public static final String ID_TEXT_LYRICS = "USLT";
+	public static final String ID_GENRE = "TCON";
+	public static final String ID_YEAR = "TYER";
+	public static final String ID_DATE = "TDAT";
+	public static final String ID_ALBUM = "TALB";
+	public static final String ID_TITLE = "TIT2";
+	public static final String ID_KEY = "TKEY";
+	public static final String ID_ARTIST = "TPE1";
+	public static final String ID_ALBUM_ARTIST = "TPE2";
+	public static final String ID_TRACK = "TRCK";
+	public static final String ID_PART_OF_SET = "TPOS";
+	public static final String ID_COMPILATION = "TCMP";
+	public static final String ID_CHAPTER_TOC = "CTOC";
+	public static final String ID_CHAPTER = "CHAP";
+	public static final String ID_GROUPING = "TIT1";
+	public static final String ID_RATING = "POPM";
+	public static final String ID_IMAGE_OBSELETE = "PIC";
+	public static final String ID_ENCODER_OBSELETE = "TEN";
+	public static final String ID_URL_OBSELETE = "WXX";
+	public static final String ID_COPYRIGHT_OBSELETE = "TCR";
+	public static final String ID_ORIGINAL_ARTIST_OBSELETE = "TOA";
+	public static final String ID_BPM_OBSELETE = "TBP";
+	public static final String ID_COMPOSER_OBSELETE = "TCM";
+	public static final String ID_PUBLISHER_OBSELETE = "TBP";
+	public static final String ID_COMMENT_OBSELETE = "COM";
+	public static final String ID_GENRE_OBSELETE = "TCO";
+	public static final String ID_YEAR_OBSELETE = "TYE";
+	public static final String ID_DATE_OBSELETE = "TDA";
+	public static final String ID_ALBUM_OBSELETE = "TAL";
+	public static final String ID_TITLE_OBSELETE = "TT2";
+	public static final String ID_KEY_OBSELETE = "TKE";
+	public static final String ID_ARTIST_OBSELETE = "TP1";
+	public static final String ID_ALBUM_ARTIST_OBSELETE = "TP2";
+	public static final String ID_TRACK_OBSELETE = "TRK";
+	public static final String ID_PART_OF_SET_OBSELETE = "TPA";
+	public static final String ID_COMPILATION_OBSELETE = "TCP";
+	public static final String ID_GROUPING_OBSELETE = "TT1";
+
+	public static final byte PICTURETYPE_OTHER = 0x0;
+	public static final byte PICTURETYPE_32PXICON = 0x1;
+	public static final byte PICTURETYPE_OTHERICON = 0x2;
+	public static final byte PICTURETYPE_FRONTCOVER = 0x3;
+	public static final byte PICTURETYPE_BACKCOVER = 0x4;
+	public static final byte PICTURETYPE_LEAFLET = 0x5;
+	public static final byte PICTURETYPE_MEDIA = 0x6;
+	public static final byte PICTURETYPE_LEADARTIST = 0x7;
+	public static final byte PICTURETYPE_ARTIST = 0x8;
+	public static final byte PICTURETYPE_CONDUCTOR = 0x9;
+	public static final byte PICTURETYPE_BAND = 0xA;
+	public static final byte PICTURETYPE_COMPOSER = 0xB;
+	public static final byte PICTURETYPE_LYRICIST = 0xC;
+	public static final byte PICTURETYPE_RECORDINGLOCATION = 0xD;
+	public static final byte PICTURETYPE_DURING_RECORDING = 0xE;
+	public static final byte PICTURETYPE_DURING_PERFORMANCE = 0xF;
+	public static final byte PICTURETYPE_SCREEN_CAPTURE = 0x10;
+	public static final byte PICTURETYPE_ILLUSTRATION = 0x12;
+	public static final byte PICTURETYPE_BAND_LOGOTYPE = 0x13;
+	public static final byte PICTURETYPE_PUBLISHER_LOGOTYPE = 0x14;
+
+
+	protected static final String TAG = "ID3";
+	protected static final String FOOTER_TAG = "3DI";
+	protected static final int HEADER_LENGTH = 10;
+	protected static final int FOOTER_LENGTH = 10;
+	protected static final int MAJOR_VERSION_OFFSET = 3;
+	protected static final int MINOR_VERSION_OFFSET = 4;
+	protected static final int FLAGS_OFFSET = 5;
+	protected static final int DATA_LENGTH_OFFSET = 6;
+	protected static final int FOOTER_BIT = 4;
+	protected static final int EXPERIMENTAL_BIT = 5;
+	protected static final int EXTENDED_HEADER_BIT = 6;
+	protected static final int COMPRESSION_BIT = 6;
+	protected static final int UNSYNCHRONISATION_BIT = 7;
+	protected static final int PADDING_LENGTH = 256;
+	private static final String ITUNES_COMMENT_DESCRIPTION = "iTunNORM";
+
+	protected boolean unsynchronisation = false;
+	protected boolean extendedHeader = false;
+	protected boolean experimental = false;
+	protected boolean footer = false;
+	protected boolean compression = false;
+	protected boolean padding = false;
+	protected String version = null;
+	private int dataLength = 0;
+	private int extendedHeaderLength;
+	private byte[] extendedHeaderData;
+	private boolean obseleteFormat = false;
+
+	private final Map<String, ID3v2FrameSet> frameSets;
+
+	public AbstractID3v2Tag() {
+		frameSets = new TreeMap<>();
+	}
+
+	public AbstractID3v2Tag(byte[] bytes) throws NoSuchTagException, UnsupportedTagException, InvalidDataException {
+		this(bytes, false);
+	}
+
+	public AbstractID3v2Tag(byte[] bytes, boolean obseleteFormat) throws NoSuchTagException, UnsupportedTagException, InvalidDataException {
+		frameSets = new TreeMap<>();
+		this.obseleteFormat = obseleteFormat;
+		unpackTag(bytes);
+	}
+
+	private void unpackTag(byte[] bytes) throws NoSuchTagException, UnsupportedTagException, InvalidDataException {
+		ID3v2TagFactory.sanityCheckTag(bytes);
+		int offset = unpackHeader(bytes);
+		try {
+			if (extendedHeader) {
+				offset = unpackExtendedHeader(bytes, offset);
+			}
+			int framesLength = dataLength;
+			if (footer) framesLength -= 10;
+			offset = unpackFrames(bytes, offset, framesLength);
+			if (footer) {
+				offset = unpackFooter(bytes, dataLength);
+			}
+		} catch (ArrayIndexOutOfBoundsException e) {
+			throw new InvalidDataException("Premature end of tag", e);
+		}
+	}
+
+	private int unpackHeader(byte[] bytes) throws UnsupportedTagException, InvalidDataException {
+		int majorVersion = bytes[MAJOR_VERSION_OFFSET];
+		int minorVersion = bytes[MINOR_VERSION_OFFSET];
+		version = majorVersion + "." + minorVersion;
+		if (majorVersion != 2 && majorVersion != 3 && majorVersion != 4) {
+			throw new UnsupportedTagException("Unsupported version " + version);
+		}
+		unpackFlags(bytes);
+		if ((bytes[FLAGS_OFFSET] & 0x0F) != 0) throw new UnsupportedTagException("Unrecognised bits in header");
+		dataLength = BufferTools.unpackSynchsafeInteger(bytes[DATA_LENGTH_OFFSET], bytes[DATA_LENGTH_OFFSET + 1], bytes[DATA_LENGTH_OFFSET + 2], bytes[DATA_LENGTH_OFFSET + 3]);
+		if (dataLength < 1) throw new InvalidDataException("Zero size tag");
+		return HEADER_LENGTH;
+	}
+
+	protected abstract void unpackFlags(byte[] bytes);
+
+	private int unpackExtendedHeader(byte[] bytes, int offset) {
+		extendedHeaderLength = BufferTools.unpackSynchsafeInteger(bytes[offset], bytes[offset + 1], bytes[offset + 2], bytes[offset + 3]) + 4;
+		extendedHeaderData = BufferTools.copyBuffer(bytes, offset + 4, extendedHeaderLength);
+		return extendedHeaderLength;
+	}
+
+	protected int unpackFrames(byte[] bytes, int offset, int framesLength) {
+		int currentOffset = offset;
+		while (currentOffset <= framesLength) {
+			ID3v2Frame frame;
+			try {
+				frame = createFrame(bytes, currentOffset);
+				addFrame(frame, false);
+				currentOffset += frame.getLength();
+			} catch (InvalidDataException e) {
+				break;
+			}
+		}
+		return currentOffset;
+	}
+
+	protected void addFrame(ID3v2Frame frame, boolean replace) {
+		ID3v2FrameSet frameSet = frameSets.get(frame.getId());
+		if (frameSet == null) {
+			frameSet = new ID3v2FrameSet(frame.getId());
+			frameSet.addFrame(frame);
+			frameSets.put(frame.getId(), frameSet);
+		} else if (replace) {
+			frameSet.clear();
+			frameSet.addFrame(frame);
+		} else {
+			frameSet.addFrame(frame);
+		}
+	}
+
+	protected ID3v2Frame createFrame(byte[] bytes, int currentOffset) throws InvalidDataException {
+		if (obseleteFormat) return new ID3v2ObseleteFrame(bytes, currentOffset);
+		return new ID3v2Frame(bytes, currentOffset);
+	}
+
+	protected ID3v2Frame createFrame(String id, byte[] data) {
+		if (obseleteFormat) return new ID3v2ObseleteFrame(id, data);
+		else return new ID3v2Frame(id, data);
+	}
+
+	private int unpackFooter(byte[] bytes, int offset) throws InvalidDataException {
+		if (!FOOTER_TAG.equals(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, offset, FOOTER_TAG.length()))) {
+			throw new InvalidDataException("Invalid footer");
+		}
+		return FOOTER_LENGTH;
+	}
+
+	@Override
+	public byte[] toBytes() throws NotSupportedException {
+		byte[] bytes = new byte[getLength()];
+		packTag(bytes);
+		return bytes;
+	}
+
+	public void packTag(byte[] bytes) throws NotSupportedException {
+		int offset = packHeader(bytes, 0);
+		if (extendedHeader) {
+			offset = packExtendedHeader(bytes, offset);
+		}
+		offset = packFrames(bytes, offset);
+		if (footer) {
+			offset = packFooter(bytes, dataLength);
+		}
+	}
+
+	private int packHeader(byte[] bytes, int offset) {
+		try {
+			BufferTools.stringIntoByteBuffer(TAG, 0, TAG.length(), bytes, offset);
+		} catch (UnsupportedEncodingException e) {
+		}
+		String[] s = version.split("\\.");
+		if (s.length > 0) {
+			byte majorVersion = Byte.parseByte(s[0]);
+			bytes[offset + MAJOR_VERSION_OFFSET] = majorVersion;
+		}
+		if (s.length > 1) {
+			byte minorVersion = Byte.parseByte(s[1]);
+			bytes[offset + MINOR_VERSION_OFFSET] = minorVersion;
+		}
+		packFlags(bytes, offset);
+		BufferTools.packSynchsafeInteger(getDataLength(), bytes, offset + DATA_LENGTH_OFFSET);
+		return offset + HEADER_LENGTH;
+	}
+
+	protected abstract void packFlags(byte[] bytes, int i);
+
+	private int packExtendedHeader(byte[] bytes, int offset) {
+		BufferTools.packSynchsafeInteger(extendedHeaderLength, bytes, offset);
+		BufferTools.copyIntoByteBuffer(extendedHeaderData, 0, extendedHeaderData.length, bytes, offset + 4);
+		return offset + 4 + extendedHeaderData.length;
+	}
+
+	public int packFrames(byte[] bytes, int offset) throws NotSupportedException {
+		int newOffset = packSpecifiedFrames(bytes, offset, null, "APIC");
+		newOffset = packSpecifiedFrames(bytes, newOffset, "APIC", null);
+		return newOffset;
+	}
+
+	private int packSpecifiedFrames(byte[] bytes, int offset, String onlyId, String notId) throws NotSupportedException {
+		for (ID3v2FrameSet frameSet : frameSets.values()) {
+			if ((onlyId == null || onlyId.equals(frameSet.getId())) && (notId == null || !notId.equals(frameSet.getId()))) {
+				for (ID3v2Frame frame : frameSet.getFrames()) {
+					if (frame.getDataLength() > 0) {
+						byte[] frameData = frame.toBytes();
+						BufferTools.copyIntoByteBuffer(frameData, 0, frameData.length, bytes, offset);
+						offset += frameData.length;
+					}
+				}
+			}
+		}
+		return offset;
+	}
+
+	private int packFooter(byte[] bytes, int offset) {
+		try {
+			BufferTools.stringIntoByteBuffer(FOOTER_TAG, 0, FOOTER_TAG.length(), bytes, offset);
+		} catch (UnsupportedEncodingException e) {
+		}
+		String[] s = version.split("\\.");
+		if (s.length > 0) {
+			byte majorVersion = Byte.parseByte(s[0]);
+			bytes[offset + MAJOR_VERSION_OFFSET] = majorVersion;
+		}
+		if (s.length > 1) {
+			byte minorVersion = Byte.parseByte(s[1]);
+			bytes[offset + MINOR_VERSION_OFFSET] = minorVersion;
+		}
+		packFlags(bytes, offset);
+		BufferTools.packSynchsafeInteger(getDataLength(), bytes, offset + DATA_LENGTH_OFFSET);
+		return offset + FOOTER_LENGTH;
+	}
+
+	private int calculateDataLength() {
+		int length = 0;
+		if (extendedHeader) length += extendedHeaderLength;
+		if (footer) length += FOOTER_LENGTH;
+		else if (padding) length += PADDING_LENGTH;
+		for (ID3v2FrameSet frameSet : frameSets.values()) {
+			for (ID3v2Frame frame : frameSet.getFrames()) {
+				length += frame.getLength();
+			}
+		}
+		return length;
+	}
+
+	protected boolean useFrameUnsynchronisation() {
+		return false;
+	}
+
+	@Override
+	public String getVersion() {
+		return version;
+	}
+
+	protected void invalidateDataLength() {
+		dataLength = 0;
+	}
+
+	@Override
+	public int getDataLength() {
+		if (dataLength == 0) {
+			dataLength = calculateDataLength();
+		}
+		return dataLength;
+	}
+
+	@Override
+	public int getLength() {
+		return getDataLength() + HEADER_LENGTH;
+	}
+
+	@Override
+	public Map<String, ID3v2FrameSet> getFrameSets() {
+		return frameSets;
+	}
+
+	@Override
+	public boolean getPadding() {
+		return padding;
+	}
+
+	@Override
+	public void setPadding(boolean padding) {
+		if (this.padding != padding) {
+			invalidateDataLength();
+			this.padding = padding;
+		}
+	}
+
+	@Override
+	public boolean hasFooter() {
+		return footer;
+	}
+
+	@Override
+	public void setFooter(boolean footer) {
+		if (this.footer != footer) {
+			invalidateDataLength();
+			this.footer = footer;
+		}
+	}
+
+	@Override
+	public boolean hasUnsynchronisation() {
+		return unsynchronisation;
+	}
+
+	@Override
+	public void setUnsynchronisation(boolean unsynchronisation) {
+		if (this.unsynchronisation != unsynchronisation) {
+			invalidateDataLength();
+			this.unsynchronisation = unsynchronisation;
+		}
+	}
+
+	@Override
+	public boolean getObseleteFormat() {
+		return obseleteFormat;
+	}
+
+	@Override
+	public String getTrack() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_TRACK_OBSELETE : ID_TRACK);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setTrack(String track) {
+		if (track != null && track.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(track));
+			addFrame(createFrame(ID_TRACK, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getPartOfSet() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_PART_OF_SET_OBSELETE : ID_PART_OF_SET);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setPartOfSet(String partOfSet) {
+		if (partOfSet != null && partOfSet.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(partOfSet));
+			addFrame(createFrame(ID_PART_OF_SET, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public boolean isCompilation() {
+		// unofficial frame used by iTunes
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_COMPILATION_OBSELETE : ID_COMPILATION);
+		if (frameData != null && frameData.getText() != null) return "1".equals(frameData.getText().toString());
+		return false;
+	}
+
+	@Override
+	public void setCompilation(boolean compilation) {
+		invalidateDataLength();
+		ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(compilation ? "1" : "0"));
+		addFrame(createFrame(ID_COMPILATION, frameData.toBytes()), true);
+	}
+
+	@Override
+	public String getGrouping() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_GROUPING_OBSELETE : ID_GROUPING);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setGrouping(String grouping) {
+		if (grouping != null && grouping.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(grouping));
+			addFrame(createFrame(ID_GROUPING, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getArtist() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_ARTIST_OBSELETE : ID_ARTIST);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setArtist(String artist) {
+		if (artist != null && artist.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(artist));
+			addFrame(createFrame(ID_ARTIST, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getAlbumArtist() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_ALBUM_ARTIST_OBSELETE : ID_ALBUM_ARTIST);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setAlbumArtist(String albumArtist) {
+		if (albumArtist != null && albumArtist.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(albumArtist));
+			addFrame(createFrame(ID_ALBUM_ARTIST, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getTitle() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_TITLE_OBSELETE : ID_TITLE);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setTitle(String title) {
+		if (title != null && title.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(title));
+			addFrame(createFrame(ID_TITLE, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getAlbum() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_ALBUM_OBSELETE : ID_ALBUM);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setAlbum(String album) {
+		if (album != null && album.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(album));
+			addFrame(createFrame(ID_ALBUM, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getYear() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_YEAR_OBSELETE : ID_YEAR);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setYear(String year) {
+		if (year != null && year.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(year));
+			addFrame(createFrame(ID_YEAR, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getDate() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_DATE_OBSELETE : ID_DATE);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setDate(String date) {
+		if (date != null && date.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(date));
+			addFrame(createFrame(ID_DATE, frameData.toBytes()), true);
+		}
+	}
+
+	private int getGenre(String text) {
+		if (text != null && text.length() > 0) {
+			try {
+				return extractGenreNumber(text);
+			} catch (NumberFormatException e) { // match genre description
+				String description = extractGenreDescription(text);
+				return ID3v1Genres.matchGenreDescription(description);
+			}
+		}
+		return -1;
+	}
+
+	@Override
+	public int getGenre() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_GENRE_OBSELETE : ID_GENRE);
+		if (frameData == null || frameData.getText() == null) {
+			return -1;
+		}
+		return getGenre(frameData.getText().toString());
+	}
+
+	@Override
+	public void setGenre(int genre) {
+		if (genre >= 0) {
+			invalidateDataLength();
+			String genreDescription = genre < ID3v1Genres.GENRES.length ? ID3v1Genres.GENRES[genre] : "";
+			String combinedGenre = "(" + (genre) + ")" + genreDescription;
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(combinedGenre));
+			addFrame(createFrame(ID_GENRE, frameData.toBytes()), true);
+		} else {
+			// TODO remove frame?
+		}
+	}
+
+	@Override
+	public int getBPM() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_BPM_OBSELETE : ID_BPM);
+		if (frameData == null || frameData.getText() == null) {
+			return -1;
+		}
+		String bpmStr = frameData.getText().toString();
+		try {
+			return Integer.parseInt(bpmStr);
+		} catch (NumberFormatException e) {
+			// try float as some utilities add BPM like 67.8, or 67,8
+			return (int) Float.parseFloat(bpmStr.trim().replaceAll(",", "."));
+		}
+	}
+
+	@Override
+	public void setBPM(int bpm) {
+		if (bpm >= 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(Integer.toString(bpm)));
+			addFrame(createFrame(ID_BPM, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getKey() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_KEY_OBSELETE : ID_KEY);
+		if (frameData == null || frameData.getText() == null) {
+			return null;
+		}
+		return frameData.getText().toString();
+	}
+
+	@Override
+	public void setKey(String key) {
+		if (key != null && key.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(key));
+			addFrame(createFrame(ID_KEY, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getGenreDescription() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_GENRE_OBSELETE : ID_GENRE);
+		if (frameData == null || frameData.getText() == null) {
+			return null;
+		}
+		String text = frameData.getText().toString();
+		if (text != null) {
+			int genreNum = getGenre(text);
+			if (genreNum >= 0 && genreNum < ID3v1Genres.GENRES.length) {
+				return ID3v1Genres.GENRES[genreNum];
+			} else {
+				String description = extractGenreDescription(text);
+				if (description != null && description.length() > 0) {
+					return description;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public void setGenreDescription(String text) throws IllegalArgumentException {
+		int genreNum = ID3v1Genres.matchGenreDescription(text);
+		if (genreNum < 0) {
+			throw new IllegalArgumentException("Unknown genre: " + text);
+		}
+		setGenre(genreNum);
+	}
+
+	protected int extractGenreNumber(String genreValue) throws NumberFormatException {
+		String value = genreValue.trim();
+		if (value.length() > 0) {
+			if (value.charAt(0) == '(') {
+				int pos = value.indexOf(')');
+				if (pos > 0) {
+					return Integer.parseInt(value.substring(1, pos));
+				}
+			}
+		}
+		return Integer.parseInt(value);
+	}
+
+	protected String extractGenreDescription(String genreValue) throws NumberFormatException {
+		String value = genreValue.trim();
+		if (value.length() > 0) {
+			if (value.charAt(0) == '(') {
+				int pos = value.indexOf(')');
+				if (pos > 0) {
+					return value.substring(pos + 1);
+				}
+			}
+			return value;
+		}
+		return null;
+	}
+
+
+	@Override
+	public String getComment() {
+		ID3v2CommentFrameData frameData = extractCommentFrameData(obseleteFormat ? ID_COMMENT_OBSELETE : ID_COMMENT, false);
+		if (frameData != null && frameData.getComment() != null) return frameData.getComment().toString();
+		return null;
+	}
+
+	@Override
+	public void setComment(String comment) {
+		if (comment != null && comment.length() > 0) {
+			invalidateDataLength();
+			ID3v2CommentFrameData frameData = new ID3v2CommentFrameData(useFrameUnsynchronisation(), "eng", null, new EncodedText(comment));
+			addFrame(createFrame(ID_COMMENT, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getItunesComment() {
+		ID3v2CommentFrameData frameData = extractCommentFrameData(obseleteFormat ? ID_COMMENT_OBSELETE : ID_COMMENT, true);
+		if (frameData != null && frameData.getComment() != null) return frameData.getComment().toString();
+		return null;
+	}
+
+	@Override
+	public void setItunesComment(String itunesComment) {
+		if (itunesComment != null && itunesComment.length() > 0) {
+			invalidateDataLength();
+			ID3v2CommentFrameData frameData = new ID3v2CommentFrameData(useFrameUnsynchronisation(), "eng", new EncodedText(ITUNES_COMMENT_DESCRIPTION), new EncodedText(itunesComment));
+			addFrame(createFrame(ID_COMMENT, frameData.toBytes()), true);
+		}
+	}
+
+	protected ID3v2CommentFrameData extractLyricsFrameData(String id) {
+		ID3v2FrameSet frameSet = frameSets.get(id);
+		if (frameSet != null) {
+			for (ID3v2Frame frame : frameSet.getFrames()) {
+				ID3v2CommentFrameData frameData;
+				try {
+					frameData = new ID3v2CommentFrameData(useFrameUnsynchronisation(), frame.getData());
+					return frameData;
+				} catch (InvalidDataException e) {
+					// Do nothing
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public String getLyrics() {
+		ID3v2CommentFrameData frameData;
+		if (obseleteFormat)
+			return null;
+		else
+			frameData = extractLyricsFrameData(ID_TEXT_LYRICS);
+
+		if (frameData != null)
+			return frameData.getComment().toString();
+
+		return null;
+	}
+
+	@Override
+	public void setLyrics(String lyrics) {
+		if (lyrics != null && lyrics.length() > 0) {
+			invalidateDataLength();
+			ID3v2CommentFrameData frameData = new ID3v2CommentFrameData(useFrameUnsynchronisation(), "eng", null, new EncodedText(lyrics));
+			addFrame(createFrame(ID_TEXT_LYRICS, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getComposer() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_COMPOSER_OBSELETE : ID_COMPOSER);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setComposer(String composer) {
+		if (composer != null && composer.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(composer));
+			addFrame(createFrame(ID_COMPOSER, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getPublisher() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_PUBLISHER_OBSELETE : ID_PUBLISHER);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setPublisher(String publisher) {
+		if (publisher != null && publisher.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(publisher));
+			addFrame(createFrame(ID_PUBLISHER, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getOriginalArtist() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_ORIGINAL_ARTIST_OBSELETE : ID_ORIGINAL_ARTIST);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setOriginalArtist(String originalArtist) {
+		if (originalArtist != null && originalArtist.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(originalArtist));
+			addFrame(createFrame(ID_ORIGINAL_ARTIST, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getCopyright() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_COPYRIGHT_OBSELETE : ID_COPYRIGHT);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setCopyright(String copyright) {
+		if (copyright != null && copyright.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(copyright));
+			addFrame(createFrame(ID_COPYRIGHT, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getArtistUrl() {
+		ID3v2WWWFrameData frameData = extractWWWFrameData(ID_ARTIST_URL);
+		if (frameData != null) return frameData.getUrl();
+		return null;
+	}
+
+	@Override
+	public void setArtistUrl(String url) {
+		if (url != null && url.length() > 0) {
+			invalidateDataLength();
+			ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
+			addFrame(createFrame(ID_ARTIST_URL, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getCommercialUrl() {
+		ID3v2WWWFrameData frameData = extractWWWFrameData(ID_COMMERCIAL_URL);
+		if (frameData != null) return frameData.getUrl();
+		return null;
+	}
+
+	@Override
+	public void setCommercialUrl(String url) {
+		if (url != null && url.length() > 0) {
+			invalidateDataLength();
+			ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
+			addFrame(createFrame(ID_COMMERCIAL_URL, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getCopyrightUrl() {
+		ID3v2WWWFrameData frameData = extractWWWFrameData(ID_COPYRIGHT_URL);
+		if (frameData != null) return frameData.getUrl();
+		return null;
+	}
+
+	@Override
+	public void setCopyrightUrl(String url) {
+		if (url != null && url.length() > 0) {
+			invalidateDataLength();
+			ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
+			addFrame(createFrame(ID_COPYRIGHT_URL, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getAudiofileUrl() {
+		ID3v2WWWFrameData frameData = extractWWWFrameData(ID_AUDIOFILE_URL);
+		if (frameData != null) return frameData.getUrl();
+		return null;
+	}
+
+	@Override
+	public void setAudiofileUrl(String url) {
+		if (url != null && url.length() > 0) {
+			invalidateDataLength();
+			ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
+			addFrame(createFrame(ID_AUDIOFILE_URL, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getAudioSourceUrl() {
+		ID3v2WWWFrameData frameData = extractWWWFrameData(ID_AUDIOSOURCE_URL);
+		if (frameData != null) return frameData.getUrl();
+		return null;
+	}
+
+	@Override
+	public void setAudioSourceUrl(String url) {
+		if (url != null && url.length() > 0) {
+			invalidateDataLength();
+			ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
+			addFrame(createFrame(ID_AUDIOSOURCE_URL, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getRadiostationUrl() {
+		ID3v2WWWFrameData frameData = extractWWWFrameData(ID_RADIOSTATION_URL);
+		if (frameData != null) return frameData.getUrl();
+		return null;
+	}
+
+	@Override
+	public void setRadiostationUrl(String url) {
+		if (url != null && url.length() > 0) {
+			invalidateDataLength();
+			ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
+			addFrame(createFrame(ID_RADIOSTATION_URL, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getPaymentUrl() {
+		ID3v2WWWFrameData frameData = extractWWWFrameData(ID_PAYMENT_URL);
+		if (frameData != null) return frameData.getUrl();
+		return null;
+	}
+
+	@Override
+	public void setPaymentUrl(String url) {
+		if (url != null && url.length() > 0) {
+			invalidateDataLength();
+			ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
+			addFrame(createFrame(ID_PAYMENT_URL, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getPublisherUrl() {
+		ID3v2WWWFrameData frameData = extractWWWFrameData(ID_PUBLISHER_URL);
+		if (frameData != null) return frameData.getUrl();
+		return null;
+	}
+
+	@Override
+	public void setPublisherUrl(String url) {
+		if (url != null && url.length() > 0) {
+			invalidateDataLength();
+			ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
+			addFrame(createFrame(ID_PUBLISHER_URL, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public String getUrl() {
+		ID3v2UrlFrameData frameData = extractUrlFrameData(obseleteFormat ? ID_URL_OBSELETE : ID_URL);
+		if (frameData != null) return frameData.getUrl();
+		return null;
+	}
+
+	@Override
+	public void setUrl(String url) {
+		if (url != null && url.length() > 0) {
+			invalidateDataLength();
+			ID3v2UrlFrameData frameData = new ID3v2UrlFrameData(useFrameUnsynchronisation(), null, url);
+			addFrame(createFrame(ID_URL, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public ArrayList<ID3v2ChapterFrameData> getChapters() {
+		if (obseleteFormat) {
+			return null;
+		}
+
+		return extractChapterFrameData(ID_CHAPTER);
+	}
+
+	@Override
+	public void setChapters(ArrayList<ID3v2ChapterFrameData> chapters) {
+		if (chapters != null) {
+			invalidateDataLength();
+			boolean first = true;
+			for (ID3v2ChapterFrameData chapter : chapters) {
+				if (first) {
+					first = false;
+					addFrame(createFrame(ID_CHAPTER, chapter.toBytes()), true);
+				} else {
+					addFrame(createFrame(ID_CHAPTER, chapter.toBytes()), false);
+				}
+			}
+		}
+	}
+
+	@Override
+	public ArrayList<ID3v2ChapterTOCFrameData> getChapterTOC() {
+		if (obseleteFormat) {
+			return null;
+		}
+
+		return extractChapterTOCFrameData(ID_CHAPTER_TOC);
+	}
+
+	@Override
+	public void setChapterTOC(ArrayList<ID3v2ChapterTOCFrameData> toc) {
+		if (toc != null) {
+			invalidateDataLength();
+			boolean first = true;
+			for (ID3v2ChapterTOCFrameData ct : toc) {
+				if (first) {
+					first = false;
+					addFrame(createFrame(ID_CHAPTER_TOC, ct.toBytes()), true);
+				} else {
+					addFrame(createFrame(ID_CHAPTER_TOC, ct.toBytes()), false);
+				}
+			}
+		}
+	}
+
+	@Override
+	public String getEncoder() {
+		ID3v2TextFrameData frameData = extractTextFrameData(obseleteFormat ? ID_ENCODER_OBSELETE : ID_ENCODER);
+		if (frameData != null && frameData.getText() != null) return frameData.getText().toString();
+		return null;
+	}
+
+	@Override
+	public void setEncoder(String encoder) {
+		if (encoder != null && encoder.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(encoder));
+			addFrame(createFrame(ID_ENCODER, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public byte[] getAlbumImage() {
+		ID3v2PictureFrameData frameData = createPictureFrameData(obseleteFormat ? ID_IMAGE_OBSELETE : ID_IMAGE);
+		if (frameData != null) return frameData.getImageData();
+		return null;
+	}
+
+	@Override
+	public void setAlbumImage(byte[] albumImage, String mimeType) {
+		setAlbumImage(albumImage, mimeType, (byte) 0, null);
+	}
+
+	@Override
+	public void setAlbumImage(byte[] albumImage, String mimeType, byte imageType, String imageDescription) {
+		if (albumImage != null && albumImage.length > 0 && mimeType != null && mimeType.length() > 0) {
+			invalidateDataLength();
+			ID3v2PictureFrameData frameData = new ID3v2PictureFrameData(
+					useFrameUnsynchronisation(), mimeType, imageType,
+					null == imageDescription ? null : new EncodedText(imageDescription),
+					albumImage);
+			addFrame(createFrame(ID_IMAGE, frameData.toBytes()), true);
+		}
+	}
+
+	@Override
+	public void clearAlbumImage() {
+		clearFrameSet(obseleteFormat ? ID_IMAGE_OBSELETE : ID_IMAGE);
+	}
+
+	@Override
+	public String getAlbumImageMimeType() {
+		ID3v2PictureFrameData frameData = createPictureFrameData(obseleteFormat ? ID_IMAGE_OBSELETE : ID_IMAGE);
+		if (frameData != null && frameData.getMimeType() != null) return frameData.getMimeType();
+		return null;
+	}
+
+	@Override
+	public void clearFrameSet(String id) {
+		if (frameSets.remove(id) != null) {
+			invalidateDataLength();
+		}
+	}
+
+
+	@Override
+	public int getWmpRating() {
+		final ID3v2PopmFrameData frameData = extractPopmFrameData(ID_RATING);
+		if (frameData != null && frameData.getAddress() != null) {
+			return frameData.getRating();
+		}
+		return -1;
+	}
+
+	@Override
+	public void setWmpRating(final int rating) {
+		if (rating >= 0 && rating < 6) {
+			invalidateDataLength();
+			final ID3v2PopmFrameData frameData = new ID3v2PopmFrameData(useFrameUnsynchronisation(), rating);
+			final byte[] bytes = frameData.toBytes();
+			addFrame(createFrame(ID_RATING, bytes), true);
+		}
+	}
+
+	private ArrayList<ID3v2ChapterFrameData> extractChapterFrameData(String id) {
+		ID3v2FrameSet frameSet = frameSets.get(id);
+		if (frameSet != null) {
+			ArrayList<ID3v2ChapterFrameData> chapterData = new ArrayList<>();
+			List<ID3v2Frame> frames = frameSet.getFrames();
+			for (ID3v2Frame frame : frames) {
+				ID3v2ChapterFrameData frameData;
+				try {
+					frameData = new ID3v2ChapterFrameData(useFrameUnsynchronisation(),
+							frame.getData());
+					chapterData.add(frameData);
+				} catch (InvalidDataException e) {
+					// do nothing
+				}
+			}
+			return chapterData;
+		}
+		return null;
+	}
+
+	private ArrayList<ID3v2ChapterTOCFrameData> extractChapterTOCFrameData(String id) {
+		ID3v2FrameSet frameSet = frameSets.get(id);
+		if (frameSet != null) {
+			ArrayList<ID3v2ChapterTOCFrameData> chapterData = new ArrayList<>();
+			List<ID3v2Frame> frames = frameSet.getFrames();
+			for (ID3v2Frame frame : frames) {
+				ID3v2ChapterTOCFrameData frameData;
+				try {
+					frameData = new ID3v2ChapterTOCFrameData(useFrameUnsynchronisation(),
+							frame.getData());
+					chapterData.add(frameData);
+				} catch (InvalidDataException e) {
+					// do nothing
+				}
+			}
+			return chapterData;
+		}
+		return null;
+	}
+
+	protected ID3v2TextFrameData extractTextFrameData(String id) {
+		ID3v2FrameSet frameSet = frameSets.get(id);
+		if (frameSet != null) {
+			ID3v2Frame frame = frameSet.getFrames().get(0);
+			ID3v2TextFrameData frameData;
+			try {
+				frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), frame.getData());
+				return frameData;
+			} catch (InvalidDataException e) {
+				// do nothing
+			}
+		}
+		return null;
+	}
+
+	private ID3v2WWWFrameData extractWWWFrameData(String id) {
+		ID3v2FrameSet frameSet = frameSets.get(id);
+		if (frameSet != null) {
+			ID3v2Frame frame = frameSet.getFrames().get(0);
+			ID3v2WWWFrameData frameData;
+			try {
+				frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), frame.getData());
+				return frameData;
+			} catch (InvalidDataException e) {
+				// do nothing
+			}
+		}
+		return null;
+	}
+
+	private ID3v2UrlFrameData extractUrlFrameData(String id) {
+		ID3v2FrameSet frameSet = frameSets.get(id);
+		if (frameSet != null) {
+			ID3v2Frame frame = frameSet.getFrames().get(0);
+			ID3v2UrlFrameData frameData;
+			try {
+				frameData = new ID3v2UrlFrameData(useFrameUnsynchronisation(), frame.getData());
+				return frameData;
+			} catch (InvalidDataException e) {
+				// do nothing
+			}
+		}
+		return null;
+	}
+
+	private ID3v2CommentFrameData extractCommentFrameData(String id, boolean itunes) {
+		ID3v2FrameSet frameSet = frameSets.get(id);
+		if (frameSet != null) {
+			for (ID3v2Frame frame : frameSet.getFrames()) {
+				ID3v2CommentFrameData frameData;
+				try {
+					frameData = new ID3v2CommentFrameData(useFrameUnsynchronisation(), frame.getData());
+					if (itunes && ITUNES_COMMENT_DESCRIPTION.equals(frameData.getDescription().toString())) {
+						return frameData;
+					} else if (!itunes) {
+						return frameData;
+					}
+				} catch (InvalidDataException e) {
+					// Do nothing
+				}
+			}
+		}
+		return null;
+	}
+
+	private ID3v2PictureFrameData createPictureFrameData(String id) {
+		ID3v2FrameSet frameSet = frameSets.get(id);
+		if (frameSet != null) {
+			ID3v2Frame frame = frameSet.getFrames().get(0);
+			ID3v2PictureFrameData frameData;
+			try {
+				if (obseleteFormat)
+					frameData = new ID3v2ObseletePictureFrameData(useFrameUnsynchronisation(), frame.getData());
+				else frameData = new ID3v2PictureFrameData(useFrameUnsynchronisation(), frame.getData());
+				return frameData;
+			} catch (InvalidDataException e) {
+				// do nothing
+			}
+		}
+		return null;
+	}
+
+	private ID3v2PopmFrameData extractPopmFrameData(final String id) {
+		final ID3v2FrameSet frameSet = frameSets.get(id);
+		if (frameSet != null) {
+			final ID3v2Frame frame = frameSet.getFrames().get(0);
+			ID3v2PopmFrameData frameData;
+			try {
+				frameData = new ID3v2PopmFrameData(useFrameUnsynchronisation(), frame.getData());
+				return frameData;
+			} catch (final InvalidDataException e) {
+				// do nothing
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (!(obj instanceof AbstractID3v2Tag)) return false;
+		if (super.equals(obj)) return true;
+		AbstractID3v2Tag other = (AbstractID3v2Tag) obj;
+		if (unsynchronisation != other.unsynchronisation) return false;
+		if (extendedHeader != other.extendedHeader) return false;
+		if (experimental != other.experimental) return false;
+		if (footer != other.footer) return false;
+		if (compression != other.compression) return false;
+		if (dataLength != other.dataLength) return false;
+		if (extendedHeaderLength != other.extendedHeaderLength) return false;
+		if (version == null) {
+			if (other.version != null) return false;
+		} else if (other.version == null) return false;
+		else if (!version.equals(other.version)) return false;
+		if (frameSets == null) {
+			if (other.frameSets != null) return false;
+		} else if (other.frameSets == null) return false;
+		else if (!frameSets.equals(other.frameSets)) return false;
+		return true;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/BaseException.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/BaseException.java
new file mode 100644
index 0000000..0117046
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/BaseException.java
@@ -0,0 +1,39 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class BaseException extends Exception {
+
+	private static final long serialVersionUID = 1L;
+
+	public BaseException() {
+		super();
+	}
+
+	public BaseException(String message) {
+		super(message);
+	}
+
+	public BaseException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public String getDetailedMessage() {
+		Throwable t = this;
+		StringBuilder s = new StringBuilder();
+		while (true) {
+			s.append('[');
+			s.append(t.getClass().getName());
+			if (t.getMessage() != null && t.getMessage().length() > 0) {
+				s.append(": ");
+				s.append(t.getMessage());
+			}
+			s.append(']');
+			t = t.getCause();
+			if (t != null) {
+				s.append(" caused by ");
+			} else {
+				break;
+			}
+		}
+		return s.toString();
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/BufferTools.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/BufferTools.java
new file mode 100644
index 0000000..1ea98d5
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/BufferTools.java
@@ -0,0 +1,285 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+
+public final class BufferTools {
+
+	private static final String defaultCharsetName = StandardCharsets.ISO_8859_1.name();
+
+	private BufferTools() {}
+
+	public static String byteBufferToStringIgnoringEncodingIssues(byte[] bytes, int offset, int length) {
+		try {
+			return byteBufferToString(bytes, offset, length, defaultCharsetName);
+		} catch (UnsupportedEncodingException e) {
+			return null;
+		}
+	}
+
+	public static String byteBufferToString(byte[] bytes, int offset, int length) throws UnsupportedEncodingException {
+		return byteBufferToString(bytes, offset, length, defaultCharsetName);
+	}
+
+	public static String byteBufferToString(byte[] bytes, int offset, int length, String charsetName) throws UnsupportedEncodingException {
+		if (length < 1) return "";
+		return new String(bytes, offset, length, charsetName);
+	}
+
+	public static byte[] stringToByteBufferIgnoringEncodingIssues(String s, int offset, int length) {
+		try {
+			return stringToByteBuffer(s, offset, length);
+		} catch (UnsupportedEncodingException e) {
+			return null;
+		}
+	}
+
+	public static byte[] stringToByteBuffer(String s, int offset, int length) throws UnsupportedEncodingException {
+		return stringToByteBuffer(s, offset, length, defaultCharsetName);
+	}
+
+	public static byte[] stringToByteBuffer(String s, int offset, int length, String charsetName) throws UnsupportedEncodingException {
+		String stringToCopy = s.substring(offset, offset + length);
+		return stringToCopy.getBytes(charsetName);
+	}
+
+	public static void stringIntoByteBuffer(String s, int offset, int length, byte[] bytes, int destOffset) throws UnsupportedEncodingException {
+		stringIntoByteBuffer(s, offset, length, bytes, destOffset, defaultCharsetName);
+	}
+
+	public static void stringIntoByteBuffer(String s, int offset, int length, byte[] bytes, int destOffset, String charsetName) throws UnsupportedEncodingException {
+		String stringToCopy = s.substring(offset, offset + length);
+		byte[] srcBytes = stringToCopy.getBytes(charsetName);
+		if (srcBytes.length > 0) {
+			System.arraycopy(srcBytes, 0, bytes, destOffset, srcBytes.length);
+		}
+	}
+
+	public static String trimStringRight(String s) {
+		int endPosition = s.length() - 1;
+		char endChar;
+		while (endPosition >= 0) {
+			endChar = s.charAt(endPosition);
+			if (endChar > 32) {
+				break;
+			}
+			endPosition--;
+		}
+		if (endPosition == s.length() - 1) return s;
+		else if (endPosition < 0) return "";
+		return s.substring(0, endPosition + 1);
+	}
+
+	public static String padStringRight(String s, int length, char padWith) {
+		if (s.length() >= length) return s;
+		StringBuilder stringBuffer = new StringBuilder(s);
+		while (stringBuffer.length() < length) {
+			stringBuffer.append(padWith);
+		}
+		return stringBuffer.toString();
+	}
+
+	public static boolean checkBit(byte b, int bitPosition) {
+		return ((b & (0x01 << bitPosition)) != 0);
+	}
+
+	public static byte setBit(byte b, int bitPosition, boolean value) {
+		byte newByte;
+		if (value) {
+			newByte = (byte) (b | ((byte) 0x01 << bitPosition));
+		} else {
+			newByte = (byte) (b & (~((byte) 0x01 << bitPosition)));
+		}
+		return newByte;
+	}
+
+	public static int shiftByte(byte c, int places) {
+		int i = c & 0xff;
+		if (places < 0) {
+			return i << -places;
+		} else if (places > 0) {
+			return i >> places;
+		}
+		return i;
+	}
+
+	public static int unpackInteger(byte b1, byte b2, byte b3, byte b4) {
+		int value = b4 & 0xff;
+		value += BufferTools.shiftByte(b3, -8);
+		value += BufferTools.shiftByte(b2, -16);
+		value += BufferTools.shiftByte(b1, -24);
+		return value;
+	}
+
+	public static byte[] packInteger(int i) {
+		byte[] bytes = new byte[4];
+		bytes[3] = (byte) (i & 0xff);
+		bytes[2] = (byte) ((i >> 8) & 0xff);
+		bytes[1] = (byte) ((i >> 16) & 0xff);
+		bytes[0] = (byte) ((i >> 24) & 0xff);
+		return bytes;
+	}
+
+	public static int unpackSynchsafeInteger(byte b1, byte b2, byte b3, byte b4) {
+		int value = ((byte) (b4 & 0x7f));
+		value += shiftByte((byte) (b3 & 0x7f), -7);
+		value += shiftByte((byte) (b2 & 0x7f), -14);
+		value += shiftByte((byte) (b1 & 0x7f), -21);
+		return value;
+	}
+
+	public static byte[] packSynchsafeInteger(int i) {
+		byte[] bytes = new byte[4];
+		packSynchsafeInteger(i, bytes, 0);
+		return bytes;
+	}
+
+	public static void packSynchsafeInteger(int i, byte[] bytes, int offset) {
+		bytes[offset + 3] = (byte) (i & 0x7f);
+		bytes[offset + 2] = (byte) ((i >> 7) & 0x7f);
+		bytes[offset + 1] = (byte) ((i >> 14) & 0x7f);
+		bytes[offset + 0] = (byte) ((i >> 21) & 0x7f);
+	}
+
+	public static byte[] copyBuffer(byte[] bytes, int offset, int length) {
+		byte[] copy = new byte[length];
+		if (length > 0) {
+			System.arraycopy(bytes, offset, copy, 0, length);
+		}
+		return copy;
+	}
+
+	public static void copyIntoByteBuffer(byte[] bytes, int offset, int length, byte[] destBuffer, int destOffset) {
+		if (length > 0) {
+			System.arraycopy(bytes, offset, destBuffer, destOffset, length);
+		}
+	}
+
+	public static int sizeUnsynchronisationWouldAdd(byte[] bytes) {
+		int count = 0;
+		for (int i = 0; i < bytes.length - 1; i++) {
+			if (bytes[i] == (byte) 0xff && ((bytes[i + 1] & (byte) 0xe0) == (byte) 0xe0 || bytes[i + 1] == 0)) {
+				count++;
+			}
+		}
+		if (bytes.length > 0 && bytes[bytes.length - 1] == (byte) 0xff) count++;
+		return count;
+	}
+
+	public static byte[] unsynchroniseBuffer(byte[] bytes) {
+		// unsynchronisation is replacing instances of:
+		// 11111111 111xxxxx with 11111111 00000000 111xxxxx and
+		// 11111111 00000000 with 11111111 00000000 00000000
+		int count = sizeUnsynchronisationWouldAdd(bytes);
+		if (count == 0) return bytes;
+		byte[] newBuffer = new byte[bytes.length + count];
+		int j = 0;
+		for (int i = 0; i < bytes.length - 1; i++) {
+			newBuffer[j++] = bytes[i];
+			if (bytes[i] == (byte) 0xff && ((bytes[i + 1] & (byte) 0xe0) == (byte) 0xe0 || bytes[i + 1] == 0)) {
+				newBuffer[j++] = 0;
+			}
+		}
+		newBuffer[j++] = bytes[bytes.length - 1];
+		if (bytes[bytes.length - 1] == (byte) 0xff) {
+			newBuffer[j++] = 0;
+		}
+		return newBuffer;
+	}
+
+	public static int sizeSynchronisationWouldSubtract(byte[] bytes) {
+		int count = 0;
+		for (int i = 0; i < bytes.length - 2; i++) {
+			if (bytes[i] == (byte) 0xff && bytes[i + 1] == 0 && ((bytes[i + 2] & (byte) 0xe0) == (byte) 0xe0 || bytes[i + 2] == 0)) {
+				count++;
+			}
+		}
+		if (bytes.length > 1 && bytes[bytes.length - 2] == (byte) 0xff && bytes[bytes.length - 1] == 0) count++;
+		return count;
+	}
+
+	public static byte[] synchroniseBuffer(byte[] bytes) {
+		// synchronisation is replacing instances of:
+		// 11111111 00000000 111xxxxx with 11111111 111xxxxx and
+		// 11111111 00000000 00000000 with 11111111 00000000
+		int count = sizeSynchronisationWouldSubtract(bytes);
+		if (count == 0) return bytes;
+		byte[] newBuffer = new byte[bytes.length - count];
+		int i = 0;
+		for (int j = 0; j < newBuffer.length - 1; j++) {
+			newBuffer[j] = bytes[i];
+			if (bytes[i] == (byte) 0xff && bytes[i + 1] == 0 && ((bytes[i + 2] & (byte) 0xe0) == (byte) 0xe0 || bytes[i + 2] == 0)) {
+				i++;
+			}
+			i++;
+		}
+		newBuffer[newBuffer.length - 1] = bytes[i];
+		return newBuffer;
+	}
+
+	public static String substitute(String s, String replaceThis, String withThis) {
+		if (replaceThis.length() < 1 || !s.contains(replaceThis)) {
+			return s;
+		}
+		StringBuilder newString = new StringBuilder();
+		int lastPosition = 0;
+		int position = 0;
+		while ((position = s.indexOf(replaceThis, position)) >= 0) {
+			if (position > lastPosition) {
+				newString.append(s, lastPosition, position);
+			}
+			if (withThis != null) {
+				newString.append(withThis);
+			}
+			lastPosition = position + replaceThis.length();
+			position++;
+		}
+		if (lastPosition < s.length()) {
+			newString.append(s.substring(lastPosition));
+		}
+		return newString.toString();
+	}
+
+	public static String asciiOnly(String s) {
+		StringBuilder newString = new StringBuilder();
+		for (int i = 0; i < s.length(); i++) {
+			char ch = s.charAt(i);
+			if (ch < 32 || ch > 126) {
+				newString.append('?');
+			} else {
+				newString.append(ch);
+			}
+		}
+		return newString.toString();
+	}
+
+	public static int indexOfTerminator(byte[] bytes) {
+		return indexOfTerminator(bytes, 0);
+	}
+
+	public static int indexOfTerminator(byte[] bytes, int fromIndex) {
+		return indexOfTerminator(bytes, 0, 1);
+	}
+
+	public static int indexOfTerminator(byte[] bytes, int fromIndex, int terminatorLength) {
+		int marker = -1;
+		for (int i = fromIndex; i <= bytes.length - terminatorLength; i++) {
+			if ((i - fromIndex) % terminatorLength == 0) {
+				int matched;
+				for (matched = 0; matched < terminatorLength; matched++) {
+					if (bytes[i + matched] != 0) break;
+				}
+				if (matched == terminatorLength) {
+					marker = i;
+					break;
+				}
+			}
+		}
+		return marker;
+	}
+
+	public static int indexOfTerminatorForEncoding(byte[] bytes, int fromIndex, int encoding) {
+		int terminatorLength = (encoding == EncodedText.TEXT_ENCODING_UTF_16 || encoding == EncodedText.TEXT_ENCODING_UTF_16BE) ? 2 : 1;
+		return indexOfTerminator(bytes, fromIndex, terminatorLength);
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ByteBufferUtils.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ByteBufferUtils.java
new file mode 100644
index 0000000..f4ac8ec
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ByteBufferUtils.java
@@ -0,0 +1,25 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.nio.ByteBuffer;
+
+public final class ByteBufferUtils {
+
+	private ByteBufferUtils() {}
+
+	public static String extractNullTerminatedString(ByteBuffer bb) {
+		int start = bb.position();
+
+		byte[] buffer = new byte[bb.remaining()];
+
+		bb.get(buffer);
+
+		String s = new String(buffer);
+		int nullPos = s.indexOf(0);
+
+		s = s.substring(0, nullPos);
+
+		bb.position(start + s.length() + 1);
+
+		return s;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/EncodedText.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/EncodedText.java
new file mode 100644
index 0000000..b41c80d
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/EncodedText.java
@@ -0,0 +1,261 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+import java.util.Arrays;
+
+public class EncodedText {
+
+	public static final byte TEXT_ENCODING_ISO_8859_1 = 0;
+	public static final byte TEXT_ENCODING_UTF_16 = 1;
+	public static final byte TEXT_ENCODING_UTF_16BE = 2;
+	public static final byte TEXT_ENCODING_UTF_8 = 3;
+
+	public static final String CHARSET_ISO_8859_1 = "ISO-8859-1";
+	public static final String CHARSET_UTF_16 = "UTF-16LE";
+	public static final String CHARSET_UTF_16BE = "UTF-16BE";
+	public static final String CHARSET_UTF_8 = "UTF-8";
+
+	private static final String[] characterSets = {
+			CHARSET_ISO_8859_1,
+			CHARSET_UTF_16,
+			CHARSET_UTF_16BE,
+			CHARSET_UTF_8
+	};
+
+	private static final byte[] textEncodingFallback = {0, 2, 1, 3};
+
+	private static final byte[][] boms = {
+			{},
+			{(byte) 0xff, (byte) 0xfe},
+			{(byte) 0xfe, (byte) 0xff},
+			{}
+	};
+
+	private static final byte[][] terminators = {
+			{0},
+			{0, 0},
+			{0, 0},
+			{0}
+	};
+
+	private byte[] value;
+	private byte textEncoding;
+
+	public EncodedText(byte textEncoding, byte[] value) {
+		// if encoding type 1 and big endian BOM is present, switch to big endian
+		if ((textEncoding == TEXT_ENCODING_UTF_16) &&
+				(textEncodingForBytesFromBOM(value) == TEXT_ENCODING_UTF_16BE)) {
+			this.textEncoding = TEXT_ENCODING_UTF_16BE;
+		} else {
+			this.textEncoding = textEncoding;
+		}
+		this.value = value;
+		this.stripBomAndTerminator();
+	}
+
+	public EncodedText(String string) throws IllegalArgumentException {
+		for (byte textEncoding : textEncodingFallback) {
+			this.textEncoding = textEncoding;
+			value = stringToBytes(string, characterSetForTextEncoding(textEncoding));
+			if (value != null && this.toString() != null) {
+				this.stripBomAndTerminator();
+				return;
+			}
+		}
+		throw new IllegalArgumentException("Invalid string, could not find appropriate encoding");
+	}
+
+	public EncodedText(String string, byte transcodeToTextEncoding) throws IllegalArgumentException, CharacterCodingException {
+		this(string);
+		setTextEncoding(transcodeToTextEncoding, true);
+	}
+
+	public EncodedText(byte textEncoding, String string) {
+		this.textEncoding = textEncoding;
+		value = stringToBytes(string, characterSetForTextEncoding(textEncoding));
+		this.stripBomAndTerminator();
+	}
+
+	public EncodedText(byte[] value) {
+		this(textEncodingForBytesFromBOM(value), value);
+	}
+
+	private static byte textEncodingForBytesFromBOM(byte[] value) {
+		if (value.length >= 2 && value[0] == (byte) 0xff && value[1] == (byte) 0xfe) {
+			return TEXT_ENCODING_UTF_16;
+		} else if (value.length >= 2 && value[0] == (byte) 0xfe && value[1] == (byte) 0xff) {
+			return TEXT_ENCODING_UTF_16BE;
+		} else if (value.length >= 3 && (value[0] == (byte) 0xef && value[1] == (byte) 0xbb && value[2] == (byte) 0xbf)) {
+			return TEXT_ENCODING_UTF_8;
+		} else {
+			return TEXT_ENCODING_ISO_8859_1;
+		}
+	}
+
+	private static String characterSetForTextEncoding(byte textEncoding) {
+		try {
+			return characterSets[textEncoding];
+		} catch (ArrayIndexOutOfBoundsException e) {
+			throw new IllegalArgumentException("Invalid text encoding " + textEncoding);
+		}
+	}
+
+	private void stripBomAndTerminator() {
+		int leadingCharsToRemove = 0;
+		if (value.length >= 2 && ((value[0] == (byte) 0xfe && value[1] == (byte) 0xff) || (value[0] == (byte) 0xff && value[1] == (byte) 0xfe))) {
+			leadingCharsToRemove = 2;
+		} else if (value.length >= 3 && (value[0] == (byte) 0xef && value[1] == (byte) 0xbb && value[2] == (byte) 0xbf)) {
+			leadingCharsToRemove = 3;
+		}
+		int trailingCharsToRemove = 0;
+		byte[] terminator = terminators[textEncoding];
+		if (value.length - leadingCharsToRemove >= terminator.length) {
+			boolean haveTerminator = true;
+			for (int i = 0; i < terminator.length; i++) {
+				if (value[value.length - terminator.length + i] != terminator[i]) {
+					haveTerminator = false;
+					break;
+				}
+			}
+			if (haveTerminator) trailingCharsToRemove = terminator.length;
+		}
+		if (leadingCharsToRemove + trailingCharsToRemove > 0) {
+			int newLength = value.length - leadingCharsToRemove - trailingCharsToRemove;
+			byte[] newValue = new byte[newLength];
+			if (newLength > 0) {
+				System.arraycopy(value, leadingCharsToRemove, newValue, 0, newValue.length);
+			}
+			value = newValue;
+		}
+	}
+
+	public byte getTextEncoding() {
+		return textEncoding;
+	}
+
+	public void setTextEncoding(byte textEncoding) throws CharacterCodingException {
+		setTextEncoding(textEncoding, true);
+	}
+
+	public void setTextEncoding(byte textEncoding, boolean transcode) throws CharacterCodingException {
+		if (this.textEncoding != textEncoding) {
+			CharBuffer charBuffer = bytesToCharBuffer(this.value, characterSetForTextEncoding(this.textEncoding));
+			byte[] transcodedBytes = charBufferToBytes(charBuffer, characterSetForTextEncoding(textEncoding));
+			this.textEncoding = textEncoding;
+			this.value = transcodedBytes;
+		}
+	}
+
+	public byte[] getTerminator() {
+		return terminators[textEncoding];
+	}
+
+	public byte[] toBytes() {
+		return toBytes(false, false);
+	}
+
+	public byte[] toBytes(boolean includeBom) {
+		return toBytes(includeBom, false);
+	}
+
+	public byte[] toBytes(boolean includeBom, boolean includeTerminator) {
+		characterSetForTextEncoding(textEncoding); // ensured textEncoding is valid
+		int newLength = value.length + (includeBom ? boms[textEncoding].length : 0) + (includeTerminator ? getTerminator().length : 0);
+		if (newLength == value.length) {
+			return value;
+		} else {
+			byte[] bytes = new byte[newLength];
+			int i = 0;
+			if (includeBom) {
+				byte[] bom = boms[textEncoding];
+				if (bom.length > 0) {
+					System.arraycopy(boms[textEncoding], 0, bytes, i, boms[textEncoding].length);
+					i += boms[textEncoding].length;
+				}
+			}
+			if (value.length > 0) {
+				System.arraycopy(value, 0, bytes, i, value.length);
+				i += value.length;
+			}
+			if (includeTerminator) {
+				byte[] terminator = getTerminator();
+				if (terminator.length > 0) {
+					System.arraycopy(terminator, 0, bytes, i, terminator.length);
+				}
+			}
+			return bytes;
+		}
+	}
+
+	@Override
+	public String toString() {
+		try {
+			return bytesToString(value, characterSetForTextEncoding(textEncoding));
+		} catch (CharacterCodingException e) {
+			return null;
+		}
+	}
+
+	public String getCharacterSet() {
+		return characterSetForTextEncoding(textEncoding);
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + textEncoding;
+		result = prime * result + Arrays.hashCode(value);
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		EncodedText other = (EncodedText) obj;
+		if (textEncoding != other.textEncoding)
+			return false;
+		if (!Arrays.equals(value, other.value))
+			return false;
+		return true;
+	}
+
+	private static String bytesToString(byte[] bytes, String characterSet) throws CharacterCodingException {
+		CharBuffer cbuf = bytesToCharBuffer(bytes, characterSet);
+		String s = cbuf.toString();
+		int length = s.indexOf(0);
+		if (length == -1) return s;
+		return s.substring(0, length);
+	}
+
+	protected static CharBuffer bytesToCharBuffer(byte[] bytes, String characterSet) throws CharacterCodingException {
+		Charset charset = Charset.forName(characterSet);
+		CharsetDecoder decoder = charset.newDecoder();
+		return decoder.decode(ByteBuffer.wrap(bytes));
+	}
+
+	private static byte[] stringToBytes(String s, String characterSet) {
+		try {
+			return charBufferToBytes(CharBuffer.wrap(s), characterSet);
+		} catch (CharacterCodingException e) {
+			return null;
+		}
+	}
+
+	protected static byte[] charBufferToBytes(CharBuffer charBuffer, String characterSet) throws CharacterCodingException {
+		Charset charset = Charset.forName(characterSet);
+		CharsetEncoder encoder = charset.newEncoder();
+		ByteBuffer byteBuffer = encoder.encode(charBuffer);
+		return BufferTools.copyBuffer(byteBuffer.array(), 0, byteBuffer.limit());
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/FileWrapper.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/FileWrapper.java
new file mode 100644
index 0000000..b6b911f
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/FileWrapper.java
@@ -0,0 +1,55 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
+
+public class FileWrapper {
+
+	protected Path path;
+	protected long length;
+	protected long lastModified;
+
+	protected FileWrapper() {
+	}
+
+	public FileWrapper(String filename) throws IOException {
+		this.path = Paths.get(filename);
+		init();
+	}
+
+	public FileWrapper(File file) throws IOException {
+		if (file == null) throw new NullPointerException();
+		this.path = Paths.get(file.getPath());
+		init();
+	}
+
+	public FileWrapper(Path path) throws IOException {
+		if (path == null) throw new NullPointerException();
+		this.path = path;
+		init();
+	}
+
+	private void init() throws IOException {
+		if (!Files.exists(path)) throw new FileNotFoundException("File not found " + path);
+		if (!Files.isReadable(path)) throw new IOException("File not readable");
+		length = Files.size(path);
+		lastModified = Files.getLastModifiedTime(path).to(TimeUnit.MILLISECONDS);
+	}
+
+	public String getFilename() {
+		return path.toString();
+	}
+
+	public long getLength() {
+		return length;
+	}
+
+	public long getLastModified() {
+		return lastModified;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3Wrapper.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3Wrapper.java
new file mode 100644
index 0000000..30f4760
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3Wrapper.java
@@ -0,0 +1,304 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class ID3Wrapper {
+
+	private final ID3v1 id3v1Tag;
+	private final ID3v2 id3v2Tag;
+
+	public ID3Wrapper(ID3v1 id3v1Tag, ID3v2 id3v2Tag) {
+		this.id3v1Tag = id3v1Tag;
+		this.id3v2Tag = id3v2Tag;
+	}
+
+	public ID3v1 getId3v1Tag() {
+		return id3v1Tag;
+	}
+
+	public ID3v2 getId3v2Tag() {
+		return id3v2Tag;
+	}
+
+	public String getTrack() {
+		if (id3v2Tag != null && id3v2Tag.getTrack() != null && id3v2Tag.getTrack().length() > 0) {
+			return id3v2Tag.getTrack();
+		} else if (id3v1Tag != null) {
+			return id3v1Tag.getTrack();
+		} else {
+			return null;
+		}
+	}
+
+	public void setTrack(String track) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setTrack(track);
+		}
+		if (id3v1Tag != null) {
+			id3v1Tag.setTrack(track);
+		}
+	}
+
+	public String getArtist() {
+		if (id3v2Tag != null && id3v2Tag.getArtist() != null && id3v2Tag.getArtist().length() > 0) {
+			return id3v2Tag.getArtist();
+		} else if (id3v1Tag != null) {
+			return id3v1Tag.getArtist();
+		} else {
+			return null;
+		}
+	}
+
+	public void setArtist(String artist) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setArtist(artist);
+		}
+		if (id3v1Tag != null) {
+			id3v1Tag.setArtist(artist);
+		}
+	}
+
+	public String getTitle() {
+		if (id3v2Tag != null && id3v2Tag.getTitle() != null && id3v2Tag.getTitle().length() > 0) {
+			return id3v2Tag.getTitle();
+		} else if (id3v1Tag != null) {
+			return id3v1Tag.getTitle();
+		} else {
+			return null;
+		}
+	}
+
+	public void setTitle(String title) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setTitle(title);
+		}
+		if (id3v1Tag != null) {
+			id3v1Tag.setTitle(title);
+		}
+	}
+
+	public String getAlbum() {
+		if (id3v2Tag != null && id3v2Tag.getAlbum() != null && id3v2Tag.getAlbum().length() > 0) {
+			return id3v2Tag.getAlbum();
+		} else if (id3v1Tag != null) {
+			return id3v1Tag.getAlbum();
+		} else {
+			return null;
+		}
+	}
+
+	public void setAlbum(String album) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setAlbum(album);
+		}
+		if (id3v1Tag != null) {
+			id3v1Tag.setAlbum(album);
+		}
+	}
+
+	public String getYear() {
+		if (id3v2Tag != null && id3v2Tag.getYear() != null && id3v2Tag.getYear().length() > 0) {
+			return id3v2Tag.getYear();
+		} else if (id3v1Tag != null) {
+			return id3v1Tag.getYear();
+		} else {
+			return null;
+		}
+	}
+
+	public void setYear(String year) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setYear(year);
+		}
+		if (id3v1Tag != null) {
+			id3v1Tag.setYear(year);
+		}
+	}
+
+	public int getGenre() {
+		if (id3v2Tag != null && id3v2Tag.getGenre() != -1) {
+			return id3v2Tag.getGenre();
+		} else if (id3v1Tag != null) {
+			return id3v1Tag.getGenre();
+		} else {
+			return -1;
+		}
+	}
+
+	public void setGenre(int genre) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setGenre(genre);
+		}
+		if (id3v1Tag != null) {
+			id3v1Tag.setGenre(genre);
+		}
+	}
+
+	public String getGenreDescription() {
+		if (id3v2Tag != null) {
+			return id3v2Tag.getGenreDescription();
+		} else if (id3v1Tag != null) {
+			return id3v1Tag.getGenreDescription();
+		} else {
+			return null;
+		}
+	}
+
+	public String getComment() {
+		if (id3v2Tag != null && id3v2Tag.getComment() != null && id3v2Tag.getComment().length() > 0) {
+			return id3v2Tag.getComment();
+		} else if (id3v1Tag != null) {
+			return id3v1Tag.getComment();
+		} else {
+			return null;
+		}
+	}
+
+	public void setComment(String comment) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setComment(comment);
+		}
+		if (id3v1Tag != null) {
+			id3v1Tag.setComment(comment);
+		}
+	}
+
+	public String getComposer() {
+		if (id3v2Tag != null) {
+			return id3v2Tag.getComposer();
+		} else {
+			return null;
+		}
+	}
+
+	public void setComposer(String composer) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setComposer(composer);
+		}
+	}
+
+	public String getOriginalArtist() {
+		if (id3v2Tag != null) {
+			return id3v2Tag.getOriginalArtist();
+		} else {
+			return null;
+		}
+	}
+
+	public void setOriginalArtist(String originalArtist) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setOriginalArtist(originalArtist);
+		}
+	}
+
+	public void setAlbumArtist(String albumArtist) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setAlbumArtist(albumArtist);
+		}
+	}
+
+	public String getAlbumArtist() {
+		if (id3v2Tag != null) {
+			return id3v2Tag.getAlbumArtist();
+		} else {
+			return null;
+		}
+	}
+
+	public String getCopyright() {
+		if (id3v2Tag != null) {
+			return id3v2Tag.getCopyright();
+		} else {
+			return null;
+		}
+	}
+
+	public void setCopyright(String copyright) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setCopyright(copyright);
+		}
+	}
+
+	public String getUrl() {
+		if (id3v2Tag != null) {
+			return id3v2Tag.getUrl();
+		} else {
+			return null;
+		}
+	}
+
+	public void setUrl(String url) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setUrl(url);
+		}
+	}
+
+	public String getEncoder() {
+		if (id3v2Tag != null) {
+			return id3v2Tag.getEncoder();
+		} else {
+			return null;
+		}
+	}
+
+	public void setEncoder(String encoder) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setEncoder(encoder);
+		}
+	}
+
+	public byte[] getAlbumImage() {
+		if (id3v2Tag != null) {
+			return id3v2Tag.getAlbumImage();
+		} else {
+			return null;
+		}
+	}
+
+	public void setAlbumImage(byte[] albumImage, String mimeType) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setAlbumImage(albumImage, mimeType);
+		}
+	}
+
+	public String getAlbumImageMimeType() {
+		if (id3v2Tag != null) {
+			return id3v2Tag.getAlbumImageMimeType();
+		} else {
+			return null;
+		}
+	}
+
+	public void setLyrics(String lyrics) {
+		if (id3v2Tag != null) {
+			id3v2Tag.setLyrics(lyrics);
+		}
+	}
+
+	public String getLyrics() {
+		if (id3v2Tag != null) {
+			return id3v2Tag.getLyrics();
+		} else {
+			return null;
+		}
+	}
+
+	public void clearComment() {
+		if (id3v2Tag != null) {
+			id3v2Tag.clearFrameSet(AbstractID3v2Tag.ID_COMMENT);
+		}
+		if (id3v1Tag != null) {
+			id3v1Tag.setComment(null);
+		}
+	}
+
+	public void clearCopyright() {
+		if (id3v2Tag != null) {
+			id3v2Tag.clearFrameSet(AbstractID3v2Tag.ID_COPYRIGHT);
+		}
+	}
+
+	public void clearEncoder() {
+		if (id3v2Tag != null) {
+			id3v2Tag.clearFrameSet(AbstractID3v2Tag.ID_ENCODER);
+		}
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v1.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v1.java
new file mode 100644
index 0000000..3293007
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v1.java
@@ -0,0 +1,38 @@
+package com.example.spotifydownloader.mp3agic;
+
+public interface ID3v1 {
+
+	String getVersion();
+
+	String getTrack();
+
+	void setTrack(String track);
+
+	String getArtist();
+
+	void setArtist(String artist);
+
+	String getTitle();
+
+	void setTitle(String title);
+
+	String getAlbum();
+
+	void setAlbum(String album);
+
+	String getYear();
+
+	void setYear(String year);
+
+	int getGenre();
+
+	void setGenre(int genre);
+
+	String getGenreDescription();
+
+	String getComment();
+
+	void setComment(String comment);
+
+	byte[] toBytes() throws NotSupportedException;
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v1Genres.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v1Genres.java
new file mode 100644
index 0000000..698971a
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v1Genres.java
@@ -0,0 +1,173 @@
+package com.example.spotifydownloader.mp3agic;
+
+public final class ID3v1Genres {
+	public static final String[] GENRES = {
+			"Blues",
+			"Classic Rock",
+			"Country",
+			"Dance",
+			"Disco",
+			"Funk",
+			"Grunge",
+			"Hip-Hop",
+			"Jazz",
+			"Metal",
+			"New Age",
+			"Oldies",
+			"Other",
+			"Pop",
+			"R&B",
+			"Rap",
+			"Reggae",
+			"Rock",
+			"Techno",
+			"Industrial",
+			"Alternative",
+			"Ska",
+			"Death Metal",
+			"Pranks",
+			"Soundtrack",
+			"Euro-Techno",
+			"Ambient",
+			"Trip-Hop",
+			"Vocal",
+			"Jazz+Funk",
+			"Fusion",
+			"Trance",
+			"Classical",
+			"Instrumental",
+			"Acid",
+			"House",
+			"Game",
+			"Sound Clip",
+			"Gospel",
+			"Noise",
+			"Alt Rock",
+			"Bass",
+			"Soul",
+			"Punk",
+			"Space",
+			"Meditative",
+			"Instrumental Pop",
+			"Instrumental Rock",
+			"Ethnic",
+			"Gothic",
+			"Darkwave",
+			"Techno-Industrial",
+			"Electronic",
+			"Pop-Folk",
+			"Eurodance",
+			"Dream",
+			"Southern Rock",
+			"Comedy",
+			"Cult",
+			"Gangsta",
+			"Top 40",
+			"Christian Rap",
+			"Pop/Funk",
+			"Jungle",
+			"Native American",
+			"Cabaret",
+			"New Wave",
+			"Psychedelic",
+			"Rave",
+			"Showtunes",
+			"Trailer",
+			"Lo-Fi",
+			"Tribal",
+			"Acid Punk",
+			"Acid Jazz",
+			"Polka",
+			"Retro",
+			"Musical",
+			"Rock & Roll",
+			"Hard Rock",
+			"Folk",
+			"Folk/Rock",
+			"National Folk",
+			"Swing",
+			"Fast Fusion",
+			"Bebob",
+			"Latin",
+			"Revival",
+			"Celtic",
+			"Bluegrass",
+			"Avantgarde",
+			"Gothic Rock",
+			"Progressive Rock",
+			"Psychedelic Rock",
+			"Symphonic Rock",
+			"Slow Rock",
+			"Big Band",
+			"Chorus",
+			"Easy Listening",
+			"Acoustic",
+			"Humour",
+			"Speech",
+			"Chanson",
+			"Opera",
+			"Chamber Music",
+			"Sonata",
+			"Symphony",
+			"Booty Bass",
+			"Primus",
+			"Porn Groove",
+			"Satire/Parody",
+			"Slow Jam",
+			"Club",
+			"Tango",
+			"Samba",
+			"Folklore",
+			"Ballad",
+			"Power Ballad",
+			"Rhythmic Soul",
+			"Freestyle",
+			"Duet",
+			"Punk Rock",
+			"Drum Solo",
+			"Acapella",
+			"Euro-House",
+			"Dance Hall",
+			"Goa",
+			"Drum & Bass",
+			"Club-House",
+			"Hardcore",
+			"Terror",
+			"Indie",
+			"BritPop",
+			"Negerpunk",
+			"Polsk Punk",
+			"Beat",
+			"Christian Gangsta",
+			"Heavy Metal",
+			"Black Metal",
+			"Crossover",
+			"Contemporary Chr",
+			"Christian Rock",
+			"Merengue",
+			"Salsa",
+			"Thrash Metal",
+			"Anime",
+			"JPop",
+			"Synthpop"
+	};
+
+	private ID3v1Genres() {}
+
+	/**
+	 * Match provided description against genres, ignoring case.
+	 *
+	 * @param description genre description
+	 * @return matching genre index or -1
+	 */
+	public static int matchGenreDescription(String description) {
+		if (description != null && description.length() > 0) {
+			for (int i = 0; i < ID3v1Genres.GENRES.length; i++) {
+				if (ID3v1Genres.GENRES[i].equalsIgnoreCase(description)) {
+					return i;
+				}
+			}
+		}
+		return -1;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v1Tag.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v1Tag.java
new file mode 100644
index 0000000..b300f97
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v1Tag.java
@@ -0,0 +1,285 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+
+public class ID3v1Tag implements ID3v1 {
+
+	public static final int TAG_LENGTH = 128;
+
+	private static final String VERSION_0 = "0";
+	private static final String VERSION_1 = "1";
+	private static final String TAG = "TAG";
+	private static final int TITLE_OFFSET = 3;
+	private static final int TITLE_LENGTH = 30;
+	private static final int ARTIST_OFFSET = 33;
+	private static final int ARTIST_LENGTH = 30;
+	private static final int ALBUM_OFFSET = 63;
+	private static final int ALBUM_LENGTH = 30;
+	private static final int YEAR_OFFSET = 93;
+	private static final int YEAR_LENGTH = 4;
+	private static final int COMMENT_OFFSET = 97;
+	private static final int COMMENT_LENGTH_V1_0 = 30;
+	private static final int COMMENT_LENGTH_V1_1 = 28;
+	private static final int TRACK_MARKER_OFFSET = 125;
+	private static final int TRACK_OFFSET = 126;
+	private static final int GENRE_OFFSET = 127;
+
+	private String track = null;
+	private String artist = null;
+	private String title = null;
+	private String album = null;
+	private String year = null;
+	private int genre = -1;
+	private String comment = null;
+
+	public ID3v1Tag() {
+	}
+
+	public ID3v1Tag(byte[] bytes) throws NoSuchTagException {
+		unpackTag(bytes);
+	}
+
+	private void unpackTag(byte[] bytes) throws NoSuchTagException {
+		sanityCheckTag(bytes);
+		title = BufferTools.trimStringRight(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, TITLE_OFFSET, TITLE_LENGTH));
+		artist = BufferTools.trimStringRight(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, ARTIST_OFFSET, ARTIST_LENGTH));
+		album = BufferTools.trimStringRight(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, ALBUM_OFFSET, ALBUM_LENGTH));
+		year = BufferTools.trimStringRight(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, YEAR_OFFSET, YEAR_LENGTH));
+		genre = bytes[GENRE_OFFSET] & 0xFF;
+		if (genre == 0xFF) {
+			genre = -1;
+		}
+		if (bytes[TRACK_MARKER_OFFSET] != 0) {
+			comment = BufferTools.trimStringRight(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, COMMENT_OFFSET, COMMENT_LENGTH_V1_0));
+			track = null;
+		} else {
+			comment = BufferTools.trimStringRight(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, COMMENT_OFFSET, COMMENT_LENGTH_V1_1));
+			int trackInt = bytes[TRACK_OFFSET];
+			if (trackInt == 0) {
+				track = "";
+			} else {
+				track = Integer.toString(trackInt);
+			}
+		}
+	}
+
+	private void sanityCheckTag(byte[] bytes) throws NoSuchTagException {
+		if (bytes.length != TAG_LENGTH) {
+			throw new NoSuchTagException("Buffer length wrong");
+		}
+		if (!TAG.equals(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, 0, TAG.length()))) {
+			throw new NoSuchTagException();
+		}
+	}
+
+	@Override
+	public byte[] toBytes() {
+		byte[] bytes = new byte[TAG_LENGTH];
+		packTag(bytes);
+		return bytes;
+	}
+
+	public void toBytes(byte[] bytes) {
+		packTag(bytes);
+	}
+
+	public void packTag(byte[] bytes) {
+		Arrays.fill(bytes, (byte) 0);
+		try {
+			BufferTools.stringIntoByteBuffer(TAG, 0, 3, bytes, 0);
+		} catch (UnsupportedEncodingException e) {
+		}
+		packField(bytes, title, TITLE_LENGTH, TITLE_OFFSET);
+		packField(bytes, artist, ARTIST_LENGTH, ARTIST_OFFSET);
+		packField(bytes, album, ALBUM_LENGTH, ALBUM_OFFSET);
+		packField(bytes, year, YEAR_LENGTH, YEAR_OFFSET);
+		if (genre < 128) {
+			bytes[GENRE_OFFSET] = (byte) genre;
+		} else {
+			bytes[GENRE_OFFSET] = (byte) (genre - 256);
+		}
+		if (track == null) {
+			packField(bytes, comment, COMMENT_LENGTH_V1_0, COMMENT_OFFSET);
+		} else {
+			packField(bytes, comment, COMMENT_LENGTH_V1_1, COMMENT_OFFSET);
+			String trackTemp = numericsOnly(track);
+			if (trackTemp.length() > 0) {
+				int trackInt = Integer.parseInt(trackTemp);
+				if (trackInt < 128) {
+					bytes[TRACK_OFFSET] = (byte) trackInt;
+				} else {
+					bytes[TRACK_OFFSET] = (byte) (trackInt - 256);
+				}
+			}
+		}
+	}
+
+	private void packField(byte[] bytes, String value, int maxLength, int offset) {
+		if (value != null) {
+			try {
+				BufferTools.stringIntoByteBuffer(value, 0, Math.min(value.length(), maxLength), bytes, offset);
+			} catch (UnsupportedEncodingException e) {
+			}
+		}
+	}
+
+	private String numericsOnly(String s) {
+		StringBuilder stringBuffer = new StringBuilder();
+		for (int i = 0; i < s.length(); i++) {
+			char ch = s.charAt(i);
+			if (ch >= '0' && ch <= '9') {
+				stringBuffer.append(ch);
+			} else {
+				break;
+			}
+		}
+		return stringBuffer.toString();
+	}
+
+	@Override
+	public String getVersion() {
+		if (track == null) {
+			return VERSION_0;
+		} else {
+			return VERSION_1;
+		}
+	}
+
+	@Override
+	public String getTrack() {
+		return track;
+	}
+
+	@Override
+	public void setTrack(String track) {
+		this.track = track;
+	}
+
+	@Override
+	public String getArtist() {
+		return artist;
+	}
+
+	@Override
+	public void setArtist(String artist) {
+		this.artist = artist;
+	}
+
+	@Override
+	public String getTitle() {
+		return title;
+	}
+
+	@Override
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	@Override
+	public String getAlbum() {
+		return album;
+	}
+
+	@Override
+	public void setAlbum(String album) {
+		this.album = album;
+	}
+
+	@Override
+	public String getYear() {
+		return year;
+	}
+
+	@Override
+	public void setYear(String year) {
+		this.year = year;
+	}
+
+	@Override
+	public int getGenre() {
+		return genre;
+	}
+
+	@Override
+	public void setGenre(int genre) {
+		this.genre = genre;
+	}
+
+	@Override
+	public String getGenreDescription() {
+		try {
+			return ID3v1Genres.GENRES[genre];
+		} catch (ArrayIndexOutOfBoundsException e) {
+			return "Unknown";
+		}
+	}
+
+	@Override
+	public String getComment() {
+		return comment;
+	}
+
+	@Override
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((album == null) ? 0 : album.hashCode());
+		result = prime * result + ((artist == null) ? 0 : artist.hashCode());
+		result = prime * result + ((comment == null) ? 0 : comment.hashCode());
+		result = prime * result + genre;
+		result = prime * result + ((title == null) ? 0 : title.hashCode());
+		result = prime * result + ((track == null) ? 0 : track.hashCode());
+		result = prime * result + ((year == null) ? 0 : year.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ID3v1Tag other = (ID3v1Tag) obj;
+		if (album == null) {
+			if (other.album != null)
+				return false;
+		} else if (!album.equals(other.album))
+			return false;
+		if (artist == null) {
+			if (other.artist != null)
+				return false;
+		} else if (!artist.equals(other.artist))
+			return false;
+		if (comment == null) {
+			if (other.comment != null)
+				return false;
+		} else if (!comment.equals(other.comment))
+			return false;
+		if (genre != other.genre)
+			return false;
+		if (title == null) {
+			if (other.title != null)
+				return false;
+		} else if (!title.equals(other.title))
+			return false;
+		if (track == null) {
+			if (other.track != null)
+				return false;
+		} else if (!track.equals(other.track))
+			return false;
+		if (year == null) {
+			if (other.year != null)
+				return false;
+		} else if (!year.equals(other.year))
+			return false;
+		return true;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2.java
new file mode 100644
index 0000000..b763b44
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2.java
@@ -0,0 +1,153 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+public interface ID3v2 extends ID3v1 {
+
+	boolean getPadding();
+
+	void setPadding(boolean padding);
+
+	boolean hasFooter();
+
+	void setFooter(boolean footer);
+
+	boolean hasUnsynchronisation();
+
+	void setUnsynchronisation(boolean unsynchronisation);
+
+	int getBPM();
+
+	void setBPM(int bpm);
+
+	String getGrouping();
+
+	void setGrouping(String grouping);
+
+	String getKey();
+
+	void setKey(String key);
+
+	String getDate();
+
+	void setDate(String date);
+
+	String getComposer();
+
+	void setComposer(String composer);
+
+	String getPublisher();
+
+	void setPublisher(String publisher);
+
+	String getOriginalArtist();
+
+	void setOriginalArtist(String originalArtist);
+
+	String getAlbumArtist();
+
+	void setAlbumArtist(String albumArtist);
+
+	String getCopyright();
+
+	void setCopyright(String copyright);
+
+	String getArtistUrl();
+
+	void setArtistUrl(String url);
+
+	String getCommercialUrl();
+
+	void setCommercialUrl(String url);
+
+	String getCopyrightUrl();
+
+	void setCopyrightUrl(String url);
+
+	String getAudiofileUrl();
+
+	void setAudiofileUrl(String url);
+
+	String getAudioSourceUrl();
+
+	void setAudioSourceUrl(String url);
+
+	String getRadiostationUrl();
+
+	void setRadiostationUrl(String url);
+
+	String getPaymentUrl();
+
+	void setPaymentUrl(String url);
+
+	String getPublisherUrl();
+
+	void setPublisherUrl(String url);
+
+	String getUrl();
+
+	void setUrl(String url);
+
+	String getPartOfSet();
+
+	void setPartOfSet(String partOfSet);
+
+	boolean isCompilation();
+
+	void setCompilation(boolean compilation);
+
+	ArrayList<ID3v2ChapterFrameData> getChapters();
+
+	void setChapters(ArrayList<ID3v2ChapterFrameData> chapters);
+
+	ArrayList<ID3v2ChapterTOCFrameData> getChapterTOC();
+
+	void setChapterTOC(ArrayList<ID3v2ChapterTOCFrameData> ctoc);
+
+	String getEncoder();
+
+	void setEncoder(String encoder);
+
+	byte[] getAlbumImage();
+
+	void setAlbumImage(byte[] albumImage, String mimeType);
+
+	void setAlbumImage(byte[] albumImage, String mimeType, byte imageType, String imageDescription);
+
+	void clearAlbumImage();
+
+	String getAlbumImageMimeType();
+
+	int getWmpRating();
+
+	void setWmpRating(int rating);
+
+	String getItunesComment();
+
+	void setItunesComment(String itunesComment);
+
+	String getLyrics();
+
+	void setLyrics(String lyrics);
+
+	/**
+	 * Set genre from text.
+	 * This method behaves different depending on the ID3 version.
+	 * Prior to ID3v2.4, the provided text must match a id3v1 genre description.
+	 * With ID3v2.4, the genre is written as free text.
+	 *
+	 * @param text genre string
+	 */
+	void setGenreDescription(String text);
+
+	int getDataLength();
+
+	int getLength();
+
+	boolean getObseleteFormat();
+
+	Map<String, ID3v2FrameSet> getFrameSets();
+
+	void clearFrameSet(String id);
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v22Tag.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v22Tag.java
new file mode 100644
index 0000000..755e1e2
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v22Tag.java
@@ -0,0 +1,31 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class ID3v22Tag extends AbstractID3v2Tag {
+
+	public static final String VERSION = "2.0";
+
+	public ID3v22Tag() {
+		super();
+		version = VERSION;
+	}
+
+	public ID3v22Tag(byte[] buffer) throws NoSuchTagException, UnsupportedTagException, InvalidDataException {
+		super(buffer);
+	}
+
+	public ID3v22Tag(byte[] buffer, boolean obseleteFormat) throws NoSuchTagException, UnsupportedTagException, InvalidDataException {
+		super(buffer, obseleteFormat);
+	}
+
+	@Override
+	protected void unpackFlags(byte[] bytes) {
+		unsynchronisation = BufferTools.checkBit(bytes[FLAGS_OFFSET], UNSYNCHRONISATION_BIT);
+		compression = BufferTools.checkBit(bytes[FLAGS_OFFSET], COMPRESSION_BIT);
+	}
+
+	@Override
+	protected void packFlags(byte[] bytes, int offset) {
+		bytes[offset + FLAGS_OFFSET] = BufferTools.setBit(bytes[offset + FLAGS_OFFSET], UNSYNCHRONISATION_BIT, unsynchronisation);
+		bytes[offset + FLAGS_OFFSET] = BufferTools.setBit(bytes[offset + FLAGS_OFFSET], COMPRESSION_BIT, compression);
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v23Tag.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v23Tag.java
new file mode 100644
index 0000000..1406b4b
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v23Tag.java
@@ -0,0 +1,29 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class ID3v23Tag extends AbstractID3v2Tag {
+
+	public static final String VERSION = "3.0";
+
+	public ID3v23Tag() {
+		super();
+		version = VERSION;
+	}
+
+	public ID3v23Tag(byte[] buffer) throws NoSuchTagException, UnsupportedTagException, InvalidDataException {
+		super(buffer);
+	}
+
+	@Override
+	protected void unpackFlags(byte[] buffer) {
+		unsynchronisation = BufferTools.checkBit(buffer[FLAGS_OFFSET], UNSYNCHRONISATION_BIT);
+		extendedHeader = BufferTools.checkBit(buffer[FLAGS_OFFSET], EXTENDED_HEADER_BIT);
+		experimental = BufferTools.checkBit(buffer[FLAGS_OFFSET], EXPERIMENTAL_BIT);
+	}
+
+	@Override
+	protected void packFlags(byte[] bytes, int offset) {
+		bytes[offset + FLAGS_OFFSET] = BufferTools.setBit(bytes[offset + FLAGS_OFFSET], UNSYNCHRONISATION_BIT, unsynchronisation);
+		bytes[offset + FLAGS_OFFSET] = BufferTools.setBit(bytes[offset + FLAGS_OFFSET], EXTENDED_HEADER_BIT, extendedHeader);
+		bytes[offset + FLAGS_OFFSET] = BufferTools.setBit(bytes[offset + FLAGS_OFFSET], EXPERIMENTAL_BIT, experimental);
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v24Frame.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v24Frame.java
new file mode 100644
index 0000000..7cbe61f
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v24Frame.java
@@ -0,0 +1,28 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class ID3v24Frame extends ID3v2Frame {
+
+	public ID3v24Frame(byte[] buffer, int offset) throws InvalidDataException {
+		super(buffer, offset);
+	}
+
+	public ID3v24Frame(String id, byte[] data) {
+		super(id, data);
+	}
+
+	@Override
+	protected void unpackDataLength(byte[] buffer, int offset) {
+		dataLength = BufferTools.unpackSynchsafeInteger(buffer[offset + DATA_LENGTH_OFFSET], buffer[offset + DATA_LENGTH_OFFSET + 1], buffer[offset + DATA_LENGTH_OFFSET + 2], buffer[offset + DATA_LENGTH_OFFSET + 3]);
+	}
+
+	@Override
+	protected byte[] packDataLength() {
+		return BufferTools.packSynchsafeInteger(dataLength);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (!(obj instanceof ID3v24Frame)) return false;
+		return super.equals(obj);
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v24Tag.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v24Tag.java
new file mode 100644
index 0000000..470f5bc
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v24Tag.java
@@ -0,0 +1,81 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class ID3v24Tag extends AbstractID3v2Tag {
+
+	public static final String VERSION = "4.0";
+
+	public static final String ID_RECTIME = "TDRC";
+
+	public ID3v24Tag() {
+		super();
+		version = VERSION;
+	}
+
+	public ID3v24Tag(byte[] buffer) throws NoSuchTagException, UnsupportedTagException, InvalidDataException {
+		super(buffer);
+	}
+
+	@Override
+	protected void unpackFlags(byte[] buffer) {
+		unsynchronisation = BufferTools.checkBit(buffer[FLAGS_OFFSET], UNSYNCHRONISATION_BIT);
+		extendedHeader = BufferTools.checkBit(buffer[FLAGS_OFFSET], EXTENDED_HEADER_BIT);
+		experimental = BufferTools.checkBit(buffer[FLAGS_OFFSET], EXPERIMENTAL_BIT);
+		footer = BufferTools.checkBit(buffer[FLAGS_OFFSET], FOOTER_BIT);
+	}
+
+	@Override
+	protected void packFlags(byte[] bytes, int offset) {
+		bytes[offset + FLAGS_OFFSET] = BufferTools.setBit(bytes[offset + FLAGS_OFFSET], UNSYNCHRONISATION_BIT, unsynchronisation);
+		bytes[offset + FLAGS_OFFSET] = BufferTools.setBit(bytes[offset + FLAGS_OFFSET], EXTENDED_HEADER_BIT, extendedHeader);
+		bytes[offset + FLAGS_OFFSET] = BufferTools.setBit(bytes[offset + FLAGS_OFFSET], EXPERIMENTAL_BIT, experimental);
+		bytes[offset + FLAGS_OFFSET] = BufferTools.setBit(bytes[offset + FLAGS_OFFSET], FOOTER_BIT, footer);
+	}
+
+	@Override
+	protected boolean useFrameUnsynchronisation() {
+		return unsynchronisation;
+	}
+
+	@Override
+	protected ID3v2Frame createFrame(byte[] buffer, int currentOffset) throws InvalidDataException {
+		return new ID3v24Frame(buffer, currentOffset);
+	}
+
+	@Override
+	protected ID3v2Frame createFrame(String id, byte[] data) {
+		return new ID3v24Frame(id, data);
+	}
+
+	@Override
+	public void setGenreDescription(String text) {
+		ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(text));
+		ID3v2FrameSet frameSet = getFrameSets().get(ID_GENRE);
+		if (frameSet == null) {
+			getFrameSets().put(ID_GENRE, frameSet = new ID3v2FrameSet(ID_GENRE));
+		}
+		frameSet.clear();
+		frameSet.addFrame(createFrame(ID_GENRE, frameData.toBytes()));
+	}
+
+
+	/*
+	 * 'recording time' (TDRC) replaces the deprecated frames 'TDAT - Date', 'TIME - Time',
+	 * 'TRDA - Recording dates' and 'TYER - Year' in 4.0
+	 */
+
+	public String getRecordingTime() {
+		ID3v2TextFrameData frameData = extractTextFrameData(ID_RECTIME);
+		if (frameData != null && frameData.getText() != null)
+			return frameData.getText().toString();
+		return null;
+	}
+
+	public void setRecordingTime(String recTime) {
+		if (recTime != null && recTime.length() > 0) {
+			invalidateDataLength();
+			ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(recTime));
+			addFrame(createFrame(ID_RECTIME, frameData.toBytes()), true);
+		}
+	}
+
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ChapterFrameData.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ChapterFrameData.java
new file mode 100644
index 0000000..2833f2c
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ChapterFrameData.java
@@ -0,0 +1,204 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+
+public class ID3v2ChapterFrameData extends AbstractID3v2FrameData {
+
+	protected String id;
+	protected int startTime;
+	protected int endTime;
+	protected int startOffset;
+	protected int endOffset;
+	protected ArrayList<ID3v2Frame> subframes = new ArrayList<>();
+
+	public ID3v2ChapterFrameData(boolean unsynchronisation) {
+		super(unsynchronisation);
+	}
+
+	public ID3v2ChapterFrameData(boolean unsynchronisation, String id, int startTime,
+								 int endTime, int startOffset, int endOffset) {
+		super(unsynchronisation);
+		this.id = id;
+		this.startTime = startTime;
+		this.endTime = endTime;
+		this.startOffset = startOffset;
+		this.endOffset = endOffset;
+	}
+
+	public ID3v2ChapterFrameData(boolean unsynchronisation, byte[] bytes)
+			throws InvalidDataException {
+		super(unsynchronisation);
+		synchroniseAndUnpackFrameData(bytes);
+	}
+
+	@Override
+	protected void unpackFrameData(byte[] bytes) throws InvalidDataException {
+		ByteBuffer bb = ByteBuffer.wrap(bytes);
+
+		id = ByteBufferUtils.extractNullTerminatedString(bb);
+
+		bb.position(id.length() + 1);
+		startTime = bb.getInt();
+		endTime = bb.getInt();
+		startOffset = bb.getInt();
+		endOffset = bb.getInt();
+
+		for (int offset = bb.position(); offset < bytes.length; ) {
+			ID3v2Frame frame = new ID3v2Frame(bytes, offset);
+			offset += frame.getLength();
+			subframes.add(frame);
+		}
+
+	}
+
+	public void addSubframe(String id, AbstractID3v2FrameData frame) {
+		subframes.add(new ID3v2Frame(id, frame.toBytes()));
+	}
+
+	@Override
+	protected byte[] packFrameData() {
+		ByteBuffer bb = ByteBuffer.allocate(getLength());
+		bb.put(id.getBytes());
+		bb.put((byte) 0);
+
+		bb.putInt(startTime);
+		bb.putInt(endTime);
+		bb.putInt(startOffset);
+		bb.putInt(endOffset);
+
+		for (ID3v2Frame frame : subframes) {
+			try {
+				bb.put(frame.toBytes());
+			} catch (NotSupportedException e) {
+				e.printStackTrace();
+			}
+		}
+		return bb.array();
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public int getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(int startTime) {
+		this.startTime = startTime;
+	}
+
+	public int getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(int endTime) {
+		this.endTime = endTime;
+	}
+
+	public int getStartOffset() {
+		return startOffset;
+	}
+
+	public void setStartOffset(int startOffset) {
+		this.startOffset = startOffset;
+	}
+
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+	public void setEndOffset(int endOffset) {
+		this.endOffset = endOffset;
+	}
+
+	public ArrayList<ID3v2Frame> getSubframes() {
+		return subframes;
+	}
+
+	public void setSubframes(ArrayList<ID3v2Frame> subframes) {
+		this.subframes = subframes;
+	}
+
+	@Override
+	protected int getLength() {
+		int length = 1;
+		length += 16;
+		if (id != null)
+			length += id.length();
+		if (subframes != null) {
+			for (ID3v2Frame frame : subframes) {
+				length += frame.getLength();
+			}
+		}
+		return length;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("ID3v2ChapterFrameData [id=");
+		builder.append(id);
+		builder.append(", startTime=");
+		builder.append(startTime);
+		builder.append(", endTime=");
+		builder.append(endTime);
+		builder.append(", startOffset=");
+		builder.append(startOffset);
+		builder.append(", endOffset=");
+		builder.append(endOffset);
+		builder.append(", subframes=");
+		builder.append(subframes);
+		builder.append("]");
+		return builder.toString();
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + endOffset;
+		result = prime * result + endTime;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + startOffset;
+		result = prime * result + startTime;
+		result = prime * result
+				+ ((subframes == null) ? 0 : subframes.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ID3v2ChapterFrameData other = (ID3v2ChapterFrameData) obj;
+		if (endOffset != other.endOffset)
+			return false;
+		if (endTime != other.endTime)
+			return false;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		if (startOffset != other.startOffset)
+			return false;
+		if (startTime != other.startTime)
+			return false;
+		if (subframes == null) {
+			if (other.subframes != null)
+				return false;
+		} else if (!subframes.equals(other.subframes))
+			return false;
+		return true;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ChapterTOCFrameData.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ChapterTOCFrameData.java
new file mode 100644
index 0000000..63a8ccb
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ChapterTOCFrameData.java
@@ -0,0 +1,230 @@
+
+package com.example.spotifydownloader.mp3agic;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class ID3v2ChapterTOCFrameData extends AbstractID3v2FrameData {
+
+	protected boolean isRoot;
+	protected boolean isOrdered;
+	protected String id;
+	protected String[] children;
+	protected ArrayList<ID3v2Frame> subframes = new ArrayList<>();
+
+	public ID3v2ChapterTOCFrameData(boolean unsynchronisation) {
+		super(unsynchronisation);
+	}
+
+	public ID3v2ChapterTOCFrameData(boolean unsynchronisation, boolean isRoot, boolean isOrdered,
+									String id, String[] children) {
+		super(unsynchronisation);
+		this.isRoot = isRoot;
+		this.isOrdered = isOrdered;
+		this.id = id;
+		this.children = children;
+	}
+
+	public ID3v2ChapterTOCFrameData(boolean unsynchronisation, byte[] bytes)
+			throws InvalidDataException {
+		super(unsynchronisation);
+		synchroniseAndUnpackFrameData(bytes);
+	}
+
+	@Override
+	protected void unpackFrameData(byte[] bytes) throws InvalidDataException {
+		ByteBuffer bb = ByteBuffer.wrap(bytes);
+
+		id = ByteBufferUtils.extractNullTerminatedString(bb);
+
+		byte flags = bb.get();
+		if ((flags & 0x01) == 0x01) {
+			isRoot = true;
+		}
+		if ((flags & 0x02) == 0x02) {
+			isOrdered = true;
+		}
+
+		int childCount = bb.get(); // TODO: 0xFF -> int = 255; byte = -128;
+
+		children = new String[childCount];
+
+		for (int i = 0; i < childCount; i++) {
+			children[i] = ByteBufferUtils.extractNullTerminatedString(bb);
+		}
+
+		for (int offset = bb.position(); offset < bytes.length; ) {
+			ID3v2Frame frame = new ID3v2Frame(bytes, offset);
+			offset += frame.getLength();
+			subframes.add(frame);
+		}
+
+	}
+
+	public void addSubframe(String id, AbstractID3v2FrameData frame) {
+		subframes.add(new ID3v2Frame(id, frame.toBytes()));
+	}
+
+	@Override
+	protected byte[] packFrameData() {
+		ByteBuffer bb = ByteBuffer.allocate(getLength());
+		bb.put(id.getBytes());
+		bb.put((byte) 0);
+		bb.put(getFlags());
+		bb.put((byte) children.length);
+
+		for (String child : children) {
+			bb.put(child.getBytes());
+			bb.put((byte) 0);
+		}
+
+		for (ID3v2Frame frame : subframes) {
+			try {
+				bb.put(frame.toBytes());
+			} catch (NotSupportedException e) {
+				e.printStackTrace();
+			}
+		}
+		return bb.array();
+	}
+
+	private byte getFlags() {
+		byte b = 0;
+
+		if (isRoot) {
+			b |= 0x01;
+		}
+
+		if (isOrdered) {
+			b |= 0x02;
+		}
+		return b;
+	}
+
+	public boolean isRoot() {
+		return isRoot;
+	}
+
+	public void setRoot(boolean isRoot) {
+		this.isRoot = isRoot;
+	}
+
+	public boolean isOrdered() {
+		return isOrdered;
+	}
+
+	public void setOrdered(boolean isOrdered) {
+		this.isOrdered = isOrdered;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String[] getChildren() {
+		return children;
+	}
+
+	public void setChildren(String[] children) {
+		this.children = children;
+	}
+
+	@Deprecated
+	public String[] getChilds() {
+		return children;
+	}
+
+	@Deprecated
+	public void setChilds(String[] childs) {
+		this.children = childs;
+	}
+
+	public ArrayList<ID3v2Frame> getSubframes() {
+		return subframes;
+	}
+
+	public void setSubframes(ArrayList<ID3v2Frame> subframes) {
+		this.subframes = subframes;
+	}
+
+	@Override
+	protected int getLength() {
+		int length = 3;
+		if (id != null) length += id.length();
+		if (children != null) {
+			length += children.length;
+			for (String child : children) {
+				length += child.length();
+			}
+		}
+		if (subframes != null) {
+			for (ID3v2Frame frame : subframes) {
+				length += frame.getLength();
+			}
+		}
+		return length;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("ID3v2ChapterTOCFrameData [isRoot=");
+		builder.append(isRoot);
+		builder.append(", isOrdered=");
+		builder.append(isOrdered);
+		builder.append(", id=");
+		builder.append(id);
+		builder.append(", children=");
+		builder.append(Arrays.toString(children));
+		builder.append(", subframes=");
+		builder.append(subframes);
+		builder.append("]");
+		return builder.toString();
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result + Arrays.hashCode(children);
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + (isOrdered ? 1231 : 1237);
+		result = prime * result + (isRoot ? 1231 : 1237);
+		result = prime * result
+				+ ((subframes == null) ? 0 : subframes.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ID3v2ChapterTOCFrameData other = (ID3v2ChapterTOCFrameData) obj;
+		if (!Arrays.equals(children, other.children))
+			return false;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		if (isOrdered != other.isOrdered)
+			return false;
+		if (isRoot != other.isRoot)
+			return false;
+		if (subframes == null) {
+			if (other.subframes != null)
+				return false;
+		} else if (!subframes.equals(other.subframes))
+			return false;
+		return true;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2CommentFrameData.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2CommentFrameData.java
new file mode 100644
index 0000000..b1ef15e
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2CommentFrameData.java
@@ -0,0 +1,155 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.UnsupportedEncodingException;
+
+public class ID3v2CommentFrameData extends AbstractID3v2FrameData {
+
+	private static final String DEFAULT_LANGUAGE = "eng";
+
+	private String language;
+	private EncodedText description;
+	private EncodedText comment;
+
+	public ID3v2CommentFrameData(boolean unsynchronisation) {
+		super(unsynchronisation);
+	}
+
+	public ID3v2CommentFrameData(boolean unsynchronisation, String language, EncodedText description, EncodedText comment) {
+		super(unsynchronisation);
+		if (description != null && comment != null && description.getTextEncoding() != comment.getTextEncoding()) {
+			throw new IllegalArgumentException("description and comment must have same text encoding");
+		}
+		this.language = language;
+		this.description = description;
+		this.comment = comment;
+	}
+
+	public ID3v2CommentFrameData(boolean unsynchronisation, byte[] bytes) throws InvalidDataException {
+		super(unsynchronisation);
+		synchroniseAndUnpackFrameData(bytes);
+	}
+
+	@Override
+	protected void unpackFrameData(byte[] bytes) {
+		try {
+			language = BufferTools.byteBufferToString(bytes, 1, 3);
+		} catch (UnsupportedEncodingException e) {
+			language = "";
+		}
+		int marker = BufferTools.indexOfTerminatorForEncoding(bytes, 4, bytes[0]);
+		if (marker >= 4) {
+			description = new EncodedText(bytes[0], BufferTools.copyBuffer(bytes, 4, marker - 4));
+			marker += description.getTerminator().length;
+		} else {
+			description = new EncodedText(bytes[0], "");
+			marker = 4;
+		}
+		comment = new EncodedText(bytes[0], BufferTools.copyBuffer(bytes, marker, bytes.length - marker));
+	}
+
+	@Override
+	protected byte[] packFrameData() {
+		byte[] bytes = new byte[getLength()];
+		if (comment != null) bytes[0] = comment.getTextEncoding();
+		else bytes[0] = 0;
+		String langPadded;
+		if (language == null) {
+			langPadded = DEFAULT_LANGUAGE;
+		} else if (language.length() > 3) {
+			langPadded = language.substring(0, 3);
+		} else {
+			langPadded = BufferTools.padStringRight(language, 3, '\00');
+		}
+		try {
+			BufferTools.stringIntoByteBuffer(langPadded, 0, 3, bytes, 1);
+		} catch (UnsupportedEncodingException e) {
+		}
+		int marker = 4;
+		if (description != null) {
+			byte[] descriptionBytes = description.toBytes(true, true);
+			BufferTools.copyIntoByteBuffer(descriptionBytes, 0, descriptionBytes.length, bytes, marker);
+			marker += descriptionBytes.length;
+		} else {
+			byte[] terminatorBytes = comment != null ? comment.getTerminator() : new byte[]{0};
+			BufferTools.copyIntoByteBuffer(terminatorBytes, 0, terminatorBytes.length, bytes, marker);
+			marker += terminatorBytes.length;
+		}
+		if (comment != null) {
+			byte[] commentBytes = comment.toBytes(true, false);
+			BufferTools.copyIntoByteBuffer(commentBytes, 0, commentBytes.length, bytes, marker);
+		}
+		return bytes;
+	}
+
+	@Override
+	protected int getLength() {
+		int length = 4;
+		if (description != null) length += description.toBytes(true, true).length;
+		else length += comment != null ? comment.getTerminator().length : 1;
+		if (comment != null) length += comment.toBytes(true, false).length;
+		return length;
+	}
+
+	public String getLanguage() {
+		return language;
+	}
+
+	public void setLanguage(String language) {
+		this.language = language;
+	}
+
+	public EncodedText getComment() {
+		return comment;
+	}
+
+	public void setComment(EncodedText comment) {
+		this.comment = comment;
+	}
+
+	public EncodedText getDescription() {
+		return description;
+	}
+
+	public void setDescription(EncodedText description) {
+		this.description = description;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result + ((comment == null) ? 0 : comment.hashCode());
+		result = prime * result
+				+ ((description == null) ? 0 : description.hashCode());
+		result = prime * result
+				+ ((language == null) ? 0 : language.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ID3v2CommentFrameData other = (ID3v2CommentFrameData) obj;
+		if (comment == null) {
+			if (other.comment != null)
+				return false;
+		} else if (!comment.equals(other.comment))
+			return false;
+		if (description == null) {
+			if (other.description != null)
+				return false;
+		} else if (!description.equals(other.description))
+			return false;
+		if (language == null) {
+			if (other.language != null)
+				return false;
+		} else if (!language.equals(other.language))
+			return false;
+		return true;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2Frame.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2Frame.java
new file mode 100644
index 0000000..ff832c1
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2Frame.java
@@ -0,0 +1,205 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.Objects;
+
+public class ID3v2Frame {
+
+	private static final int HEADER_LENGTH = 10;
+	private static final int ID_OFFSET = 0;
+	private static final int ID_LENGTH = 4;
+	protected static final int DATA_LENGTH_OFFSET = 4;
+	private static final int FLAGS1_OFFSET = 8;
+	private static final int FLAGS2_OFFSET = 9;
+	private static final int PRESERVE_TAG_BIT = 6;
+	private static final int PRESERVE_FILE_BIT = 5;
+	private static final int READ_ONLY_BIT = 4;
+	private static final int GROUP_BIT = 6;
+	private static final int COMPRESSION_BIT = 3;
+	private static final int ENCRYPTION_BIT = 2;
+	private static final int UNSYNCHRONISATION_BIT = 1;
+	private static final int DATA_LENGTH_INDICATOR_BIT = 0;
+
+	protected String id;
+	protected int dataLength = 0;
+	protected byte[] data = null;
+	private boolean preserveTag = false;
+	private boolean preserveFile = false;
+	private boolean readOnly = false;
+	private boolean group = false;
+	private boolean compression = false;
+	private boolean encryption = false;
+	private boolean unsynchronisation = false;
+	private boolean dataLengthIndicator = false;
+
+	public ID3v2Frame(byte[] buffer, int offset) throws InvalidDataException {
+		unpackFrame(buffer, offset);
+	}
+
+	public ID3v2Frame(String id, byte[] data) {
+		this.id = id;
+		this.data = data;
+		dataLength = data.length;
+	}
+
+	protected final void unpackFrame(byte[] buffer, int offset) throws InvalidDataException {
+		int dataOffset = unpackHeader(buffer, offset);
+		sanityCheckUnpackedHeader();
+		data = BufferTools.copyBuffer(buffer, dataOffset, dataLength);
+	}
+
+	protected int unpackHeader(byte[] buffer, int offset) {
+		id = BufferTools.byteBufferToStringIgnoringEncodingIssues(buffer, offset + ID_OFFSET, ID_LENGTH);
+		unpackDataLength(buffer, offset);
+		unpackFlags(buffer, offset);
+		return offset + HEADER_LENGTH;
+	}
+
+	protected void unpackDataLength(byte[] buffer, int offset) {
+		dataLength = BufferTools.unpackInteger(buffer[offset + DATA_LENGTH_OFFSET], buffer[offset + DATA_LENGTH_OFFSET + 1], buffer[offset + DATA_LENGTH_OFFSET + 2], buffer[offset + DATA_LENGTH_OFFSET + 3]);
+	}
+
+	private void unpackFlags(byte[] buffer, int offset) {
+		preserveTag = BufferTools.checkBit(buffer[offset + FLAGS1_OFFSET], PRESERVE_TAG_BIT);
+		preserveFile = BufferTools.checkBit(buffer[offset + FLAGS1_OFFSET], PRESERVE_FILE_BIT);
+		readOnly = BufferTools.checkBit(buffer[offset + FLAGS1_OFFSET], READ_ONLY_BIT);
+		group = BufferTools.checkBit(buffer[offset + FLAGS2_OFFSET], GROUP_BIT);
+		compression = BufferTools.checkBit(buffer[offset + FLAGS2_OFFSET], COMPRESSION_BIT);
+		encryption = BufferTools.checkBit(buffer[offset + FLAGS2_OFFSET], ENCRYPTION_BIT);
+		unsynchronisation = BufferTools.checkBit(buffer[offset + FLAGS2_OFFSET], UNSYNCHRONISATION_BIT);
+		dataLengthIndicator = BufferTools.checkBit(buffer[offset + FLAGS2_OFFSET], DATA_LENGTH_INDICATOR_BIT);
+	}
+
+	protected void sanityCheckUnpackedHeader() throws InvalidDataException {
+		for (int i = 0; i < id.length(); i++) {
+			if (!((id.charAt(i) >= 'A' && id.charAt(i) <= 'Z') || (id.charAt(i) >= '0' && id.charAt(i) <= '9'))) {
+				throw new InvalidDataException("Not a valid frame - invalid tag " + id);
+			}
+		}
+	}
+
+	public byte[] toBytes() throws NotSupportedException {
+		byte[] bytes = new byte[getLength()];
+		packFrame(bytes, 0);
+		return bytes;
+	}
+
+	public void toBytes(byte[] bytes, int offset) throws NotSupportedException {
+		packFrame(bytes, offset);
+	}
+
+	public void packFrame(byte[] bytes, int offset) throws NotSupportedException {
+		packHeader(bytes, offset);
+		BufferTools.copyIntoByteBuffer(data, 0, data.length, bytes, offset + HEADER_LENGTH);
+	}
+
+	private void packHeader(byte[] bytes, int i) {
+		try {
+			BufferTools.stringIntoByteBuffer(id, 0, id.length(), bytes, 0);
+		} catch (UnsupportedEncodingException e) {
+		}
+		BufferTools.copyIntoByteBuffer(packDataLength(), 0, 4, bytes, 4);
+		BufferTools.copyIntoByteBuffer(packFlags(), 0, 2, bytes, 8);
+	}
+
+	protected byte[] packDataLength() {
+		return BufferTools.packInteger(dataLength);
+	}
+
+	private byte[] packFlags() {
+		byte[] bytes = new byte[2];
+		bytes[0] = BufferTools.setBit(bytes[0], PRESERVE_TAG_BIT, preserveTag);
+		bytes[0] = BufferTools.setBit(bytes[0], PRESERVE_FILE_BIT, preserveFile);
+		bytes[0] = BufferTools.setBit(bytes[0], READ_ONLY_BIT, readOnly);
+		bytes[1] = BufferTools.setBit(bytes[1], GROUP_BIT, group);
+		bytes[1] = BufferTools.setBit(bytes[1], COMPRESSION_BIT, compression);
+		bytes[1] = BufferTools.setBit(bytes[1], ENCRYPTION_BIT, encryption);
+		bytes[1] = BufferTools.setBit(bytes[1], UNSYNCHRONISATION_BIT, unsynchronisation);
+		bytes[1] = BufferTools.setBit(bytes[1], DATA_LENGTH_INDICATOR_BIT, dataLengthIndicator);
+		return bytes;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public int getDataLength() {
+		return dataLength;
+	}
+
+	public int getLength() {
+		return dataLength + HEADER_LENGTH;
+	}
+
+	public byte[] getData() {
+		return data;
+	}
+
+	public void setData(byte[] data) {
+		this.data = data;
+		if (data == null) dataLength = 0;
+		else dataLength = data.length;
+	}
+
+	public boolean hasDataLengthIndicator() {
+		return dataLengthIndicator;
+	}
+
+	public boolean hasCompression() {
+		return compression;
+	}
+
+	public boolean hasEncryption() {
+		return encryption;
+	}
+
+	public boolean hasGroup() {
+		return group;
+	}
+
+	public boolean hasPreserveFile() {
+		return preserveFile;
+	}
+
+	public boolean hasPreserveTag() {
+		return preserveTag;
+	}
+
+	public boolean isReadOnly() {
+		return readOnly;
+	}
+
+	public boolean hasUnsynchronisation() {
+		return unsynchronisation;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * Objects.hash(compression, dataLength, dataLengthIndicator, encryption, group,
+				id, preserveFile, preserveTag, readOnly, unsynchronisation) + Arrays.hashCode(data);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		final ID3v2Frame other = (ID3v2Frame) obj;
+		return
+				Arrays.equals(data, other.data) &&
+				Objects.equals(compression, other.compression) &&
+				Objects.equals(dataLength, other.dataLength) &&
+				Objects.equals(dataLengthIndicator, other.dataLengthIndicator) &&
+				Objects.equals(encryption, other.encryption) &&
+				Objects.equals(group, other.group) &&
+				Objects.equals(id, other.id) &&
+				Objects.equals(preserveFile, other.preserveFile) &&
+				Objects.equals(preserveTag, other.preserveTag) &&
+				Objects.equals(readOnly, other.readOnly) &&
+				Objects.equals(unsynchronisation, other.unsynchronisation);
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2FrameSet.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2FrameSet.java
new file mode 100644
index 0000000..2442306
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2FrameSet.java
@@ -0,0 +1,67 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ID3v2FrameSet {
+
+	private final String id;
+	private final ArrayList<ID3v2Frame> frames;
+
+	public ID3v2FrameSet(String id) {
+		this.id = id;
+		frames = new ArrayList<>();
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void clear() {
+		frames.clear();
+	}
+
+	public void addFrame(ID3v2Frame frame) {
+		frames.add(frame);
+	}
+
+	public List<ID3v2Frame> getFrames() {
+		return frames;
+	}
+
+	@Override
+	public String toString() {
+		return this.id + ": " + frames.size();
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((frames == null) ? 0 : frames.hashCode());
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ID3v2FrameSet other = (ID3v2FrameSet) obj;
+		if (frames == null) {
+			if (other.frames != null)
+				return false;
+		} else if (!frames.equals(other.frames))
+			return false;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		return true;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ObseleteFrame.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ObseleteFrame.java
new file mode 100644
index 0000000..948e736
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ObseleteFrame.java
@@ -0,0 +1,39 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class ID3v2ObseleteFrame extends ID3v2Frame {
+
+	private static final int HEADER_LENGTH = 6;
+	private static final int ID_OFFSET = 0;
+	private static final int ID_LENGTH = 3;
+	protected static final int DATA_LENGTH_OFFSET = 3;
+
+	public ID3v2ObseleteFrame(byte[] buffer, int offset) throws InvalidDataException {
+		super(buffer, offset);
+	}
+
+	public ID3v2ObseleteFrame(String id, byte[] data) {
+		super(id, data);
+	}
+
+	@Override
+	protected int unpackHeader(byte[] buffer, int offset) {
+		id = BufferTools.byteBufferToStringIgnoringEncodingIssues(buffer, offset + ID_OFFSET, ID_LENGTH);
+		unpackDataLength(buffer, offset);
+		return offset + HEADER_LENGTH;
+	}
+
+	@Override
+	protected void unpackDataLength(byte[] buffer, int offset) {
+		dataLength = BufferTools.unpackInteger((byte) 0, buffer[offset + DATA_LENGTH_OFFSET], buffer[offset + DATA_LENGTH_OFFSET + 1], buffer[offset + DATA_LENGTH_OFFSET + 2]);
+	}
+
+	@Override
+	public void packFrame(byte[] bytes, int offset) throws NotSupportedException {
+		throw (new NotSupportedException("Packing Obselete frames is not supported"));
+	}
+
+	@Override
+	public int getLength() {
+		return dataLength + HEADER_LENGTH;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ObseletePictureFrameData.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ObseletePictureFrameData.java
new file mode 100644
index 0000000..8f60031
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2ObseletePictureFrameData.java
@@ -0,0 +1,39 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.UnsupportedEncodingException;
+
+public class ID3v2ObseletePictureFrameData extends ID3v2PictureFrameData {
+
+	public ID3v2ObseletePictureFrameData(boolean unsynchronisation) {
+		super(unsynchronisation);
+	}
+
+	public ID3v2ObseletePictureFrameData(boolean unsynchronisation, String mimeType, byte pictureType, EncodedText description, byte[] imageData) {
+		super(unsynchronisation, mimeType, pictureType, description, imageData);
+	}
+
+	public ID3v2ObseletePictureFrameData(boolean unsynchronisation, byte[] bytes) throws InvalidDataException {
+		super(unsynchronisation, bytes);
+	}
+
+	@Override
+	protected void unpackFrameData(byte[] bytes) {
+		String filetype;
+		try {
+			filetype = BufferTools.byteBufferToString(bytes, 1, 3);
+		} catch (UnsupportedEncodingException e) {
+			filetype = "unknown";
+		}
+		mimeType = "image/" + filetype.toLowerCase();
+		pictureType = bytes[4];
+		int marker = BufferTools.indexOfTerminatorForEncoding(bytes, 5, bytes[0]);
+		if (marker >= 0) {
+			description = new EncodedText(bytes[0], BufferTools.copyBuffer(bytes, 5, marker - 5));
+			marker += description.getTerminator().length;
+		} else {
+			description = new EncodedText(bytes[0], "");
+			marker = 1;
+		}
+		imageData = BufferTools.copyBuffer(bytes, marker, bytes.length - marker);
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2PictureFrameData.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2PictureFrameData.java
new file mode 100644
index 0000000..e8b6dc8
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2PictureFrameData.java
@@ -0,0 +1,164 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+
+public class ID3v2PictureFrameData extends AbstractID3v2FrameData {
+
+	protected String mimeType;
+	protected byte pictureType;
+	protected EncodedText description;
+	protected byte[] imageData;
+
+	public ID3v2PictureFrameData(boolean unsynchronisation) {
+		super(unsynchronisation);
+	}
+
+	public ID3v2PictureFrameData(boolean unsynchronisation, String mimeType, byte pictureType, EncodedText description, byte[] imageData) {
+		super(unsynchronisation);
+		this.mimeType = mimeType;
+		this.pictureType = pictureType;
+		this.description = description;
+		this.imageData = imageData;
+	}
+
+	public ID3v2PictureFrameData(boolean unsynchronisation, byte[] bytes) throws InvalidDataException {
+		super(unsynchronisation);
+		synchroniseAndUnpackFrameData(bytes);
+	}
+
+	@Override
+	protected void unpackFrameData(byte[] bytes) {
+		int marker = BufferTools.indexOfTerminator(bytes, 1, 1);
+		if (marker >= 0) {
+			try {
+				mimeType = BufferTools.byteBufferToString(bytes, 1, marker - 1);
+			} catch (UnsupportedEncodingException e) {
+				mimeType = "image/unknown";
+			}
+		} else {
+			mimeType = "image/unknown";
+		}
+		pictureType = bytes[marker + 1];
+		marker += 2;
+		int marker2 = BufferTools.indexOfTerminatorForEncoding(bytes, marker, bytes[0]);
+		if (marker2 >= 0) {
+			description = new EncodedText(bytes[0], BufferTools.copyBuffer(bytes, marker, marker2 - marker));
+			marker2 += description.getTerminator().length;
+		} else {
+			description = new EncodedText(bytes[0], "");
+			marker2 = marker;
+		}
+		imageData = BufferTools.copyBuffer(bytes, marker2, bytes.length - marker2);
+	}
+
+	@Override
+	protected byte[] packFrameData() {
+		byte[] bytes = new byte[getLength()];
+		if (description != null) bytes[0] = description.getTextEncoding();
+		else bytes[0] = 0;
+		int mimeTypeLength = 0;
+		if (mimeType != null && mimeType.length() > 0) {
+			mimeTypeLength = mimeType.length();
+			try {
+				BufferTools.stringIntoByteBuffer(mimeType, 0, mimeTypeLength, bytes, 1);
+			} catch (UnsupportedEncodingException e) {
+			}
+		}
+		int marker = mimeTypeLength + 1;
+		bytes[marker++] = 0;
+		bytes[marker++] = pictureType;
+		if (description != null && description.toBytes().length > 0) {
+			byte[] descriptionBytes = description.toBytes(true, true);
+			BufferTools.copyIntoByteBuffer(descriptionBytes, 0, descriptionBytes.length, bytes, marker);
+			marker += descriptionBytes.length;
+		} else {
+			bytes[marker++] = 0;
+		}
+		if (imageData != null && imageData.length > 0) {
+			BufferTools.copyIntoByteBuffer(imageData, 0, imageData.length, bytes, marker);
+		}
+		return bytes;
+	}
+
+	@Override
+	protected int getLength() {
+		int length = 3;
+		if (mimeType != null) length += mimeType.length();
+		if (description != null) length += description.toBytes(true, true).length;
+		else length++;
+		if (imageData != null) length += imageData.length;
+		return length;
+	}
+
+	public String getMimeType() {
+		return mimeType;
+	}
+
+	public void setMimeType(String mimeType) {
+		this.mimeType = mimeType;
+	}
+
+	public byte getPictureType() {
+		return pictureType;
+	}
+
+	public void setPictureType(byte pictureType) {
+		this.pictureType = pictureType;
+	}
+
+	public EncodedText getDescription() {
+		return description;
+	}
+
+	public void setDescription(EncodedText description) {
+		this.description = description;
+	}
+
+	public byte[] getImageData() {
+		return imageData;
+	}
+
+	public void setImageData(byte[] imageData) {
+		this.imageData = imageData;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result
+				+ ((description == null) ? 0 : description.hashCode());
+		result = prime * result + Arrays.hashCode(imageData);
+		result = prime * result
+				+ ((mimeType == null) ? 0 : mimeType.hashCode());
+		result = prime * result + pictureType;
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ID3v2PictureFrameData other = (ID3v2PictureFrameData) obj;
+		if (description == null) {
+			if (other.description != null)
+				return false;
+		} else if (!description.equals(other.description))
+			return false;
+		if (!Arrays.equals(imageData, other.imageData))
+			return false;
+		if (mimeType == null) {
+			if (other.mimeType != null)
+				return false;
+		} else if (!mimeType.equals(other.mimeType))
+			return false;
+		if (pictureType != other.pictureType)
+			return false;
+		return true;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2PopmFrameData.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2PopmFrameData.java
new file mode 100644
index 0000000..71f49d7
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2PopmFrameData.java
@@ -0,0 +1,107 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ID3v2PopmFrameData extends AbstractID3v2FrameData {
+
+	protected static final String WMP9_ADDRESS = "Windows Media Player 9 Series";
+
+	protected String address = "";
+	protected int rating = -1;
+
+	private static final Map<Byte, Integer> byteToRating = new HashMap<>(5);
+	private static final byte[] wmp9encodedRatings = {(byte) 0x00, (byte) 0x01, (byte) 0x40, (byte) 0x80, (byte) 0xC4,
+			(byte) 0xFF};
+
+	static {
+		for (int i = 0; i < 6; i++) {
+			byteToRating.put(wmp9encodedRatings[i], i);
+		}
+	}
+
+	public ID3v2PopmFrameData(boolean unsynchronisation, byte[] bytes) throws InvalidDataException {
+		super(unsynchronisation);
+		synchroniseAndUnpackFrameData(bytes);
+	}
+
+	public ID3v2PopmFrameData(boolean unsynchronisation, int rating) {
+		super(unsynchronisation);
+		this.address = WMP9_ADDRESS;
+		this.rating = rating;
+	}
+
+	@Override
+	protected void unpackFrameData(byte[] bytes) {
+		try {
+			address = BufferTools.byteBufferToString(bytes, 0, bytes.length - 2);
+		} catch (UnsupportedEncodingException e) {
+			address = "";
+		}
+		final byte ratingByte = bytes[bytes.length - 1];
+		rating = byteToRating.getOrDefault(ratingByte, -1);
+
+	}
+
+	@Override
+	protected byte[] packFrameData() {
+		byte[] bytes = address.getBytes();
+		bytes = Arrays.copyOf(bytes, address.length() + 2);
+		bytes[bytes.length - 2] = 0;
+		bytes[bytes.length - 1] = wmp9encodedRatings[rating];
+		return bytes;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public int getRating() {
+		return rating;
+	}
+
+	public void setRating(int rating) {
+		this.rating = rating;
+	}
+
+	@Override
+	protected int getLength() {
+		return address.length() + 2;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result + ((address == null) ? 0 : address.hashCode());
+		result = prime * result + rating;
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ID3v2PopmFrameData other = (ID3v2PopmFrameData) obj;
+		if (address == null) {
+			if (other.address != null)
+				return false;
+		} else if (!address.equals(other.address))
+			return false;
+		if (rating != other.rating)
+			return false;
+		return true;
+	}
+
+
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2TagFactory.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2TagFactory.java
new file mode 100644
index 0000000..dcaf65d
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2TagFactory.java
@@ -0,0 +1,41 @@
+package com.example.spotifydownloader.mp3agic;
+
+public final class ID3v2TagFactory {
+	private ID3v2TagFactory() {}
+
+	public static AbstractID3v2Tag createTag(byte[] bytes) throws NoSuchTagException, UnsupportedTagException, InvalidDataException {
+		sanityCheckTag(bytes);
+		int majorVersion = bytes[AbstractID3v2Tag.MAJOR_VERSION_OFFSET];
+		switch (majorVersion) {
+			case 2:
+				return createID3v22Tag(bytes);
+			case 3:
+				return new ID3v23Tag(bytes);
+			case 4:
+				return new ID3v24Tag(bytes);
+		}
+		throw new UnsupportedTagException("Tag version not supported");
+	}
+
+	private static AbstractID3v2Tag createID3v22Tag(byte[] bytes) throws NoSuchTagException, UnsupportedTagException, InvalidDataException {
+		ID3v22Tag tag = new ID3v22Tag(bytes);
+		if (tag.getFrameSets().isEmpty()) {
+			tag = new ID3v22Tag(bytes, true);
+		}
+		return tag;
+	}
+
+	public static void sanityCheckTag(byte[] bytes) throws NoSuchTagException, UnsupportedTagException {
+		if (bytes.length < AbstractID3v2Tag.HEADER_LENGTH) {
+			throw new NoSuchTagException("Buffer too short");
+		}
+		if (!AbstractID3v2Tag.TAG.equals(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, 0, AbstractID3v2Tag.TAG.length()))) {
+			throw new NoSuchTagException();
+		}
+		int majorVersion = bytes[AbstractID3v2Tag.MAJOR_VERSION_OFFSET];
+		if (majorVersion != 2 && majorVersion != 3 && majorVersion != 4) {
+			int minorVersion = bytes[AbstractID3v2Tag.MINOR_VERSION_OFFSET];
+			throw new UnsupportedTagException("Unsupported version 2." + majorVersion + "." + minorVersion);
+		}
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2TextFrameData.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2TextFrameData.java
new file mode 100644
index 0000000..b61a9fb
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2TextFrameData.java
@@ -0,0 +1,78 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class ID3v2TextFrameData extends AbstractID3v2FrameData {
+
+	protected EncodedText text;
+
+	public ID3v2TextFrameData(boolean unsynchronisation) {
+		super(unsynchronisation);
+	}
+
+	public ID3v2TextFrameData(boolean unsynchronisation, EncodedText text) {
+		super(unsynchronisation);
+		this.text = text;
+	}
+
+	public ID3v2TextFrameData(boolean unsynchronisation, byte[] bytes) throws InvalidDataException {
+		super(unsynchronisation);
+		synchroniseAndUnpackFrameData(bytes);
+	}
+
+	@Override
+	protected void unpackFrameData(byte[] bytes) {
+		text = new EncodedText(bytes[0], BufferTools.copyBuffer(bytes, 1, bytes.length - 1));
+	}
+
+	@Override
+	protected byte[] packFrameData() {
+		byte[] bytes = new byte[getLength()];
+		if (text != null) {
+			bytes[0] = text.getTextEncoding();
+			byte[] textBytes = text.toBytes(true, false);
+			if (textBytes.length > 0) {
+				BufferTools.copyIntoByteBuffer(textBytes, 0, textBytes.length, bytes, 1);
+			}
+		}
+		return bytes;
+	}
+
+	@Override
+	protected int getLength() {
+		int length = 1;
+		if (text != null) length += text.toBytes(true, false).length;
+		return length;
+	}
+
+	public EncodedText getText() {
+		return text;
+	}
+
+	public void setText(EncodedText text) {
+		this.text = text;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result + ((text == null) ? 0 : text.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ID3v2TextFrameData other = (ID3v2TextFrameData) obj;
+		if (text == null) {
+			if (other.text != null)
+				return false;
+		} else if (!text.equals(other.text))
+			return false;
+		return true;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2UrlFrameData.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2UrlFrameData.java
new file mode 100644
index 0000000..23a4437
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2UrlFrameData.java
@@ -0,0 +1,119 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.UnsupportedEncodingException;
+
+public class ID3v2UrlFrameData extends AbstractID3v2FrameData {
+
+	protected String url;
+	protected EncodedText description;
+
+	public ID3v2UrlFrameData(boolean unsynchronisation) {
+		super(unsynchronisation);
+	}
+
+	public ID3v2UrlFrameData(boolean unsynchronisation, EncodedText description, String url) {
+		super(unsynchronisation);
+		this.description = description;
+		this.url = url;
+	}
+
+	public ID3v2UrlFrameData(boolean unsynchronisation, byte[] bytes) throws InvalidDataException {
+		super(unsynchronisation);
+		synchroniseAndUnpackFrameData(bytes);
+	}
+
+	@Override
+	protected void unpackFrameData(byte[] bytes) {
+		int marker = BufferTools.indexOfTerminatorForEncoding(bytes, 1, bytes[0]);
+		if (marker >= 0) {
+			description = new EncodedText(bytes[0], BufferTools.copyBuffer(bytes, 1, marker - 1));
+			marker += description.getTerminator().length;
+		} else {
+			description = new EncodedText(bytes[0], "");
+			marker = 1;
+		}
+		try {
+			url = BufferTools.byteBufferToString(bytes, marker, bytes.length - marker);
+		} catch (UnsupportedEncodingException e) {
+			url = "";
+		}
+	}
+
+	@Override
+	protected byte[] packFrameData() {
+		byte[] bytes = new byte[getLength()];
+		if (description != null) bytes[0] = description.getTextEncoding();
+		else bytes[0] = 0;
+		int marker = 1;
+		if (description != null) {
+			byte[] descriptionBytes = description.toBytes(true, true);
+			BufferTools.copyIntoByteBuffer(descriptionBytes, 0, descriptionBytes.length, bytes, marker);
+			marker += descriptionBytes.length;
+		} else {
+			bytes[marker++] = 0;
+		}
+		if (url != null && url.length() > 0) {
+			try {
+				BufferTools.stringIntoByteBuffer(url, 0, url.length(), bytes, marker);
+			} catch (UnsupportedEncodingException e) {
+			}
+		}
+		return bytes;
+	}
+
+	@Override
+	protected int getLength() {
+		int length = 1;
+		if (description != null) length += description.toBytes(true, true).length;
+		else length++;
+		if (url != null) length += url.length();
+		return length;
+	}
+
+	public EncodedText getDescription() {
+		return description;
+	}
+
+	public void setDescription(EncodedText description) {
+		this.description = description;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result + ((description == null) ? 0 : description.hashCode());
+		result = prime * result + ((url == null) ? 0 : url.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ID3v2UrlFrameData other = (ID3v2UrlFrameData) obj;
+		if (description == null) {
+			if (other.description != null)
+				return false;
+		} else if (!description.equals(other.description))
+			return false;
+		if (url == null) {
+			if (other.url != null)
+				return false;
+		} else if (!url.equals(other.url))
+			return false;
+		return true;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2WWWFrameData.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2WWWFrameData.java
new file mode 100644
index 0000000..a7fdca0
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/ID3v2WWWFrameData.java
@@ -0,0 +1,59 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.UnsupportedEncodingException;
+
+public class ID3v2WWWFrameData extends AbstractID3v2FrameData {
+
+	protected String url;
+
+	public ID3v2WWWFrameData(boolean unsynchronisation) {
+		super(unsynchronisation);
+	}
+
+	public ID3v2WWWFrameData(boolean unsynchronisation, String url) {
+		super(unsynchronisation);
+		this.url = url;
+	}
+
+	public ID3v2WWWFrameData(boolean unsynchronisation, byte[] bytes) throws InvalidDataException {
+		super(unsynchronisation);
+		synchroniseAndUnpackFrameData(bytes);
+	}
+
+	@Override
+	protected void unpackFrameData(byte[] bytes) {
+		try {
+			url = BufferTools.byteBufferToString(bytes, 0, bytes.length);
+		} catch (UnsupportedEncodingException e) {
+			url = "";
+		}
+	}
+
+	@Override
+	protected byte[] packFrameData() {
+		byte[] bytes = new byte[getLength()];
+		if (url != null && url.length() > 0) {
+			try {
+				BufferTools.stringIntoByteBuffer(url, 0, url.length(), bytes, 0);
+			} catch (UnsupportedEncodingException e) {
+			}
+		}
+		return bytes;
+	}
+
+	@Override
+	protected int getLength() {
+		int length = 0;
+		if (url != null) length = url.length();
+		return length;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/InvalidDataException.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/InvalidDataException.java
new file mode 100644
index 0000000..4ae2cdb
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/InvalidDataException.java
@@ -0,0 +1,18 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class InvalidDataException extends BaseException {
+
+	private static final long serialVersionUID = 1L;
+
+	public InvalidDataException() {
+		super();
+	}
+
+	public InvalidDataException(String message) {
+		super(message);
+	}
+
+	public InvalidDataException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/Mp3File.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/Mp3File.java
new file mode 100644
index 0000000..7d9e831
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/Mp3File.java
@@ -0,0 +1,493 @@
+package com.example.spotifydownloader.mp3agic;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.SeekableByteChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Mp3File extends FileWrapper {
+
+	private static final int DEFAULT_BUFFER_LENGTH = 65536;
+	private static final int MINIMUM_BUFFER_LENGTH = 40;
+	private static final int XING_MARKER_OFFSET_1 = 13;
+	private static final int XING_MARKER_OFFSET_2 = 21;
+	private static final int XING_MARKER_OFFSET_3 = 36;
+
+	protected int bufferLength;
+	private int xingOffset = -1;
+	private int startOffset = -1;
+	private int endOffset = -1;
+	private int frameCount = 0;
+	private final Map<Integer, MutableInteger> bitrates = new HashMap<>();
+	private int xingBitrate;
+	private double bitrate = 0;
+	private String channelMode;
+	private String emphasis;
+	private String layer;
+	private String modeExtension;
+	private int sampleRate;
+	private boolean copyright;
+	private boolean original;
+	private String version;
+	private ID3v1 id3v1Tag;
+	private ID3v2 id3v2Tag;
+	private byte[] customTag;
+	private boolean scanFile;
+
+	protected Mp3File() {
+	}
+
+	public Mp3File(String filename) throws IOException, UnsupportedTagException, InvalidDataException {
+		this(filename, DEFAULT_BUFFER_LENGTH, true);
+	}
+
+	public Mp3File(String filename, int bufferLength) throws IOException, UnsupportedTagException, InvalidDataException {
+		this(filename, bufferLength, true);
+	}
+
+	public Mp3File(String filename, boolean scanFile) throws IOException, UnsupportedTagException, InvalidDataException {
+		this(filename, DEFAULT_BUFFER_LENGTH, scanFile);
+	}
+
+	public Mp3File(String filename, int bufferLength, boolean scanFile) throws IOException, UnsupportedTagException, InvalidDataException {
+		super(filename);
+		init(bufferLength, scanFile);
+	}
+
+	public Mp3File(File file) throws IOException, UnsupportedTagException, InvalidDataException {
+		this(file, DEFAULT_BUFFER_LENGTH, true);
+	}
+
+	public Mp3File(File file, int bufferLength) throws IOException, UnsupportedTagException, InvalidDataException {
+		this(file, bufferLength, true);
+	}
+
+	public Mp3File(File file, int bufferLength, boolean scanFile) throws IOException, UnsupportedTagException, InvalidDataException {
+		super(file);
+		init(bufferLength, scanFile);
+	}
+
+	public Mp3File(Path path) throws IOException, UnsupportedTagException, InvalidDataException {
+		this(path, DEFAULT_BUFFER_LENGTH, true);
+	}
+
+	public Mp3File(Path path, int bufferLength) throws IOException, UnsupportedTagException, InvalidDataException {
+		this(path, bufferLength, true);
+	}
+
+	public Mp3File(Path path, int bufferLength, boolean scanFile) throws IOException, UnsupportedTagException, InvalidDataException {
+		super(path);
+		init(bufferLength, scanFile);
+	}
+
+	private void init(int bufferLength, boolean scanFile) throws IOException, UnsupportedTagException, InvalidDataException {
+		if (bufferLength < MINIMUM_BUFFER_LENGTH + 1) throw new IllegalArgumentException("Buffer too small");
+
+		this.bufferLength = bufferLength;
+		this.scanFile = scanFile;
+
+		try (SeekableByteChannel seekableByteChannel = Files.newByteChannel(path, StandardOpenOption.READ)) {
+			initId3v1Tag(seekableByteChannel);
+			scanFile(seekableByteChannel);
+			if (startOffset < 0) {
+				throw new InvalidDataException("No mpegs frames found");
+			}
+			initId3v2Tag(seekableByteChannel);
+			if (scanFile) {
+				initCustomTag(seekableByteChannel);
+			}
+		}
+	}
+
+	protected int preScanFile(SeekableByteChannel seekableByteChannel) {
+		ByteBuffer byteBuffer = ByteBuffer.allocate(AbstractID3v2Tag.HEADER_LENGTH);
+		try {
+			seekableByteChannel.position(0);
+			byteBuffer.clear();
+			int bytesRead = seekableByteChannel.read(byteBuffer);
+			if (bytesRead == AbstractID3v2Tag.HEADER_LENGTH) {
+				try {
+					byte[] bytes = byteBuffer.array();
+					ID3v2TagFactory.sanityCheckTag(bytes);
+					return AbstractID3v2Tag.HEADER_LENGTH + BufferTools.unpackSynchsafeInteger(bytes[AbstractID3v2Tag.DATA_LENGTH_OFFSET], bytes[AbstractID3v2Tag.DATA_LENGTH_OFFSET + 1], bytes[AbstractID3v2Tag.DATA_LENGTH_OFFSET + 2], bytes[AbstractID3v2Tag.DATA_LENGTH_OFFSET + 3]);
+				} catch (NoSuchTagException | UnsupportedTagException e) {
+					// do nothing
+				}
+			}
+		} catch (IOException e) {
+			// do nothing
+		}
+		return 0;
+	}
+
+	private void scanFile(SeekableByteChannel seekableByteChannel) throws IOException, InvalidDataException {
+		ByteBuffer byteBuffer = ByteBuffer.allocate(bufferLength);
+		int fileOffset = preScanFile(seekableByteChannel);
+		seekableByteChannel.position(fileOffset);
+		boolean lastBlock = false;
+		int lastOffset = fileOffset;
+		while (!lastBlock) {
+			byteBuffer.clear();
+			int bytesRead = seekableByteChannel.read(byteBuffer);
+			byte[] bytes = byteBuffer.array();
+			if (bytesRead < bufferLength) lastBlock = true;
+			if (bytesRead >= MINIMUM_BUFFER_LENGTH) {
+				while (true) {
+					try {
+						int offset = 0;
+						if (startOffset < 0) {
+							offset = scanBlockForStart(bytes, bytesRead, fileOffset, offset);
+							if (startOffset >= 0 && !scanFile) {
+								return;
+							}
+							lastOffset = startOffset;
+						}
+						offset = scanBlock(bytes, bytesRead, fileOffset, offset);
+						fileOffset += offset;
+						seekableByteChannel.position(fileOffset);
+						break;
+					} catch (InvalidDataException e) {
+						if (frameCount < 2) {
+							startOffset = -1;
+							xingOffset = -1;
+							frameCount = 0;
+							bitrates.clear();
+							lastBlock = false;
+							fileOffset = lastOffset + 1;
+							if (fileOffset == 0)
+								throw new InvalidDataException("Valid start of mpeg frames not found", e);
+							seekableByteChannel.position(fileOffset);
+							break;
+						}
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	private int scanBlockForStart(byte[] bytes, int bytesRead, int absoluteOffset, int offset) {
+		while (offset < bytesRead - MINIMUM_BUFFER_LENGTH) {
+			if (bytes[offset] == (byte) 0xFF && (bytes[offset + 1] & (byte) 0xE0) == (byte) 0xE0) {
+				try {
+					MpegFrame frame = new MpegFrame(bytes[offset], bytes[offset + 1], bytes[offset + 2], bytes[offset + 3]);
+					if (xingOffset < 0 && isXingFrame(bytes, offset)) {
+						xingOffset = absoluteOffset + offset;
+						xingBitrate = frame.getBitrate();
+						offset += frame.getLengthInBytes();
+					} else {
+						startOffset = absoluteOffset + offset;
+						channelMode = frame.getChannelMode();
+						emphasis = frame.getEmphasis();
+						layer = frame.getLayer();
+						modeExtension = frame.getModeExtension();
+						sampleRate = frame.getSampleRate();
+						version = frame.getVersion();
+						copyright = frame.isCopyright();
+						original = frame.isOriginal();
+						frameCount++;
+						addBitrate(frame.getBitrate());
+						offset += frame.getLengthInBytes();
+						return offset;
+					}
+				} catch (InvalidDataException e) {
+					offset++;
+				}
+			} else {
+				offset++;
+			}
+		}
+		return offset;
+	}
+
+	private int scanBlock(byte[] bytes, int bytesRead, int absoluteOffset, int offset) throws InvalidDataException {
+		while (offset < bytesRead - MINIMUM_BUFFER_LENGTH) {
+			MpegFrame frame = new MpegFrame(bytes[offset], bytes[offset + 1], bytes[offset + 2], bytes[offset + 3]);
+			sanityCheckFrame(frame, absoluteOffset + offset);
+			int newEndOffset = absoluteOffset + offset + frame.getLengthInBytes() - 1;
+			if (newEndOffset < maxEndOffset()) {
+				endOffset = absoluteOffset + offset + frame.getLengthInBytes() - 1;
+				frameCount++;
+				addBitrate(frame.getBitrate());
+				offset += frame.getLengthInBytes();
+			} else {
+				break;
+			}
+		}
+		return offset;
+	}
+
+	private int maxEndOffset() {
+		int maxEndOffset = (int) getLength();
+		if (hasId3v1Tag()) maxEndOffset -= ID3v1Tag.TAG_LENGTH;
+		return maxEndOffset;
+	}
+
+	private boolean isXingFrame(byte[] bytes, int offset) {
+		if (bytes.length >= offset + XING_MARKER_OFFSET_1 + 3) {
+			if ("Xing".equals(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, offset + XING_MARKER_OFFSET_1, 4)))
+				return true;
+			if ("Info".equals(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, offset + XING_MARKER_OFFSET_1, 4)))
+				return true;
+			if (bytes.length >= offset + XING_MARKER_OFFSET_2 + 3) {
+				if ("Xing".equals(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, offset + XING_MARKER_OFFSET_2, 4)))
+					return true;
+				if ("Info".equals(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, offset + XING_MARKER_OFFSET_2, 4)))
+					return true;
+				if (bytes.length >= offset + XING_MARKER_OFFSET_3 + 3) {
+					if ("Xing".equals(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, offset + XING_MARKER_OFFSET_3, 4)))
+						return true;
+					if ("Info".equals(BufferTools.byteBufferToStringIgnoringEncodingIssues(bytes, offset + XING_MARKER_OFFSET_3, 4)))
+						return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	private void sanityCheckFrame(MpegFrame frame, int offset) throws InvalidDataException {
+		if (sampleRate != frame.getSampleRate()) throw new InvalidDataException("Inconsistent frame header");
+		if (!layer.equals(frame.getLayer())) throw new InvalidDataException("Inconsistent frame header");
+		if (!version.equals(frame.getVersion())) throw new InvalidDataException("Inconsistent frame header");
+		if (offset + frame.getLengthInBytes() > getLength())
+			throw new InvalidDataException("Frame would extend beyond end of file");
+	}
+
+	private void addBitrate(final int bitrate) {
+		MutableInteger count = bitrates.get(bitrate);
+		if (count != null) {
+			count.increment();
+		} else {
+			bitrates.put(bitrate, new MutableInteger(1));
+		}
+		this.bitrate = ((this.bitrate * (frameCount - 1)) + bitrate) / frameCount;
+	}
+
+	private void initId3v1Tag(SeekableByteChannel seekableByteChannel) throws IOException {
+		ByteBuffer byteBuffer = ByteBuffer.allocate(ID3v1Tag.TAG_LENGTH);
+		seekableByteChannel.position(getLength() - ID3v1Tag.TAG_LENGTH);
+		byteBuffer.clear();
+		int bytesRead = seekableByteChannel.read(byteBuffer);
+		if (bytesRead < ID3v1Tag.TAG_LENGTH) throw new IOException("Not enough bytes read");
+		try {
+			id3v1Tag = new ID3v1Tag(byteBuffer.array());
+		} catch (NoSuchTagException e) {
+			id3v1Tag = null;
+		}
+	}
+
+	private void initId3v2Tag(SeekableByteChannel seekableByteChannel) throws IOException, UnsupportedTagException, InvalidDataException {
+		if (xingOffset == 0 || startOffset == 0) {
+			id3v2Tag = null;
+		} else {
+			int bufferLength;
+			if (hasXingFrame()) bufferLength = xingOffset;
+			else bufferLength = startOffset;
+			ByteBuffer byteBuffer = ByteBuffer.allocate(bufferLength);
+			seekableByteChannel.position(0);
+			byteBuffer.clear();
+			int bytesRead = seekableByteChannel.read(byteBuffer);
+			if (bytesRead < bufferLength) throw new IOException("Not enough bytes read");
+			try {
+				id3v2Tag = ID3v2TagFactory.createTag(byteBuffer.array());
+			} catch (NoSuchTagException e) {
+				id3v2Tag = null;
+			}
+		}
+	}
+
+	private void initCustomTag(SeekableByteChannel seekableByteChannel) throws IOException {
+		int bufferLength = (int) (getLength() - (endOffset + 1));
+		if (hasId3v1Tag()) bufferLength -= ID3v1Tag.TAG_LENGTH;
+		if (bufferLength <= 0) {
+			customTag = null;
+		} else {
+			ByteBuffer byteBuffer = ByteBuffer.allocate(bufferLength);
+			seekableByteChannel.position(endOffset + 1);
+			byteBuffer.clear();
+			int bytesRead = seekableByteChannel.read(byteBuffer);
+			customTag = byteBuffer.array();
+			if (bytesRead < bufferLength) throw new IOException("Not enough bytes read");
+		}
+	}
+
+	public int getFrameCount() {
+		return frameCount;
+	}
+
+	public int getStartOffset() {
+		return startOffset;
+	}
+
+	public int getEndOffset() {
+		return endOffset;
+	}
+
+	public long getLengthInMilliseconds() {
+		return (long) (((endOffset - startOffset) * (8.0 / bitrate)) + 0.5);
+	}
+
+	public long getLengthInSeconds() {
+		return ((getLengthInMilliseconds() + 500) / 1000);
+	}
+
+	public boolean isVbr() {
+		return bitrates.size() > 1;
+	}
+
+	public int getBitrate() {
+		return (int) (bitrate + 0.5);
+	}
+
+	public Map<Integer, MutableInteger> getBitrates() {
+		return bitrates;
+	}
+
+	public String getChannelMode() {
+		return channelMode;
+	}
+
+	public boolean isCopyright() {
+		return copyright;
+	}
+
+	public String getEmphasis() {
+		return emphasis;
+	}
+
+	public String getLayer() {
+		return layer;
+	}
+
+	public String getModeExtension() {
+		return modeExtension;
+	}
+
+	public boolean isOriginal() {
+		return original;
+	}
+
+	public int getSampleRate() {
+		return sampleRate;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public boolean hasXingFrame() {
+		return (xingOffset >= 0);
+	}
+
+	public int getXingOffset() {
+		return xingOffset;
+	}
+
+	public int getXingBitrate() {
+		return xingBitrate;
+	}
+
+	public boolean hasId3v1Tag() {
+		return id3v1Tag != null;
+	}
+
+	public ID3v1 getId3v1Tag() {
+		return id3v1Tag;
+	}
+
+	public void setId3v1Tag(ID3v1 id3v1Tag) {
+		this.id3v1Tag = id3v1Tag;
+	}
+
+	public void removeId3v1Tag() {
+		this.id3v1Tag = null;
+	}
+
+	public boolean hasId3v2Tag() {
+		return id3v2Tag != null;
+	}
+
+	public ID3v2 getId3v2Tag() {
+		return id3v2Tag;
+	}
+
+	public void setId3v2Tag(ID3v2 id3v2Tag) {
+		this.id3v2Tag = id3v2Tag;
+	}
+
+	public void removeId3v2Tag() {
+		this.id3v2Tag = null;
+	}
+
+	public boolean hasCustomTag() {
+		return customTag != null;
+	}
+
+	public byte[] getCustomTag() {
+		return customTag;
+	}
+
+	public void setCustomTag(byte[] customTag) {
+		this.customTag = customTag;
+	}
+
+	public void removeCustomTag() {
+		this.customTag = null;
+	}
+
+	public void save(String newFilename) throws IOException, NotSupportedException {
+		if (path.toAbsolutePath().compareTo(Paths.get(newFilename).toAbsolutePath()) == 0) {
+			throw new IllegalArgumentException("Save filename same as source filename");
+		}
+		try (SeekableByteChannel saveFile = Files.newByteChannel(Paths.get(newFilename), EnumSet.of(StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE))) {
+			if (hasId3v2Tag()) {
+				ByteBuffer byteBuffer = ByteBuffer.wrap(id3v2Tag.toBytes());
+				byteBuffer.rewind();
+				saveFile.write(byteBuffer);
+			}
+			saveMpegFrames(saveFile);
+			if (hasCustomTag()) {
+				ByteBuffer byteBuffer = ByteBuffer.wrap(customTag);
+				byteBuffer.rewind();
+				saveFile.write(byteBuffer);
+			}
+			if (hasId3v1Tag()) {
+				ByteBuffer byteBuffer = ByteBuffer.wrap(id3v1Tag.toBytes());
+				byteBuffer.rewind();
+				saveFile.write(byteBuffer);
+			}
+		}
+	}
+
+	private void saveMpegFrames(SeekableByteChannel saveFile) throws IOException {
+		int filePos = xingOffset;
+		if (filePos < 0) filePos = startOffset;
+		if (filePos < 0) return;
+		if (endOffset < filePos) return;
+		ByteBuffer byteBuffer = ByteBuffer.allocate(bufferLength);
+		try (SeekableByteChannel seekableByteChannel = Files.newByteChannel(path, StandardOpenOption.READ)) {
+			seekableByteChannel.position(filePos);
+			while (true) {
+				byteBuffer.clear();
+				int bytesRead = seekableByteChannel.read(byteBuffer);
+				byteBuffer.rewind();
+				if (filePos + bytesRead <= endOffset) {
+					byteBuffer.limit(bytesRead);
+					saveFile.write(byteBuffer);
+					filePos += bytesRead;
+				} else {
+					byteBuffer.limit(endOffset - filePos + 1);
+					saveFile.write(byteBuffer);
+					break;
+				}
+			}
+		}
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/MpegFrame.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/MpegFrame.java
new file mode 100644
index 0000000..7724bf8
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/MpegFrame.java
@@ -0,0 +1,561 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class MpegFrame {
+
+	public static final String MPEG_VERSION_1_0 = "1.0";
+	public static final String MPEG_VERSION_2_0 = "2.0";
+	public static final String MPEG_VERSION_2_5 = "2.5";
+	public static final String MPEG_LAYER_1 = "I";
+	public static final String MPEG_LAYER_2 = "II";
+	public static final String MPEG_LAYER_3 = "III";
+	public static final String[] MPEG_LAYERS = {null, MPEG_LAYER_1, MPEG_LAYER_2, MPEG_LAYER_3};
+	public static final String CHANNEL_MODE_MONO = "Mono";
+	public static final String CHANNEL_MODE_DUAL_MONO = "Dual mono";
+	public static final String CHANNEL_MODE_JOINT_STEREO = "Joint stereo";
+	public static final String CHANNEL_MODE_STEREO = "Stereo";
+	public static final String MODE_EXTENSION_BANDS_4_31 = "Bands 4-31";
+	public static final String MODE_EXTENSION_BANDS_8_31 = "Bands 8-31";
+	public static final String MODE_EXTENSION_BANDS_12_31 = "Bands 12-31";
+	public static final String MODE_EXTENSION_BANDS_16_31 = "Bands 16-31";
+	public static final String MODE_EXTENSION_NONE = "None";
+	public static final String MODE_EXTENSION_INTENSITY_STEREO = "Intensity stereo";
+	public static final String MODE_EXTENSION_M_S_STEREO = "M/S stereo";
+	public static final String MODE_EXTENSION_INTENSITY_M_S_STEREO = "Intensity & M/S stereo";
+	public static final String MODE_EXTENSION_NA = "n/a";
+	public static final String EMPHASIS_NONE = "None";
+	public static final String EMPHASIS__50_15_MS = "50/15 ms";
+	public static final String EMPHASIS_CCITT_J_17 = "CCITT J.17";
+
+	private static final int FRAME_DATA_LENGTH = 4;
+	private static final int FRAME_SYNC = 0x7FF;
+	private static final long BITMASK_FRAME_SYNC = 0xFFE00000L;
+	private static final long BITMASK_VERSION = 0x180000L;
+	private static final long BITMASK_LAYER = 0x60000L;
+	private static final long BITMASK_PROTECTION = 0x10000L;
+	private static final long BITMASK_BITRATE = 0xF000L;
+	private static final long BITMASK_SAMPLE_RATE = 0xC00L;
+	private static final long BITMASK_PADDING = 0x200L;
+	private static final long BITMASK_PRIVATE = 0x100L;
+	private static final long BITMASK_CHANNEL_MODE = 0xC0L;
+	private static final long BITMASK_MODE_EXTENSION = 0x30L;
+	private static final long BITMASK_COPYRIGHT = 0x8L;
+	private static final long BITMASK_ORIGINAL = 0x4L;
+	private static final long BITMASK_EMPHASIS = 0x3L;
+
+	private String version;
+	private int layer;
+	private boolean protection;
+	private int bitrate;
+	private int sampleRate;
+	private boolean padding;
+	private boolean privat;
+	private String channelMode;
+	private String modeExtension;
+	private boolean copyright;
+	private boolean original;
+	private String emphasis;
+
+	public MpegFrame(byte[] frameData) throws InvalidDataException {
+		if (frameData.length < FRAME_DATA_LENGTH) throw new InvalidDataException("Mpeg frame too short");
+		long frameHeader = BufferTools.unpackInteger(frameData[0], frameData[1], frameData[2], frameData[3]);
+		setFields(frameHeader);
+	}
+
+	public MpegFrame(byte frameData1, byte frameData2, byte frameData3, byte frameData4) throws InvalidDataException {
+		long frameHeader = BufferTools.unpackInteger(frameData1, frameData2, frameData3, frameData4);
+		setFields(frameHeader);
+	}
+
+	protected MpegFrame() {
+	}
+
+	private void setFields(long frameHeader) throws InvalidDataException {
+		long frameSync = extractField(frameHeader, BITMASK_FRAME_SYNC);
+		if (frameSync != FRAME_SYNC) throw new InvalidDataException("Frame sync missing");
+		setVersion(extractField(frameHeader, BITMASK_VERSION));
+		setLayer(extractField(frameHeader, BITMASK_LAYER));
+		setProtection(extractField(frameHeader, BITMASK_PROTECTION));
+		setBitRate(extractField(frameHeader, BITMASK_BITRATE));
+		setSampleRate(extractField(frameHeader, BITMASK_SAMPLE_RATE));
+		setPadding(extractField(frameHeader, BITMASK_PADDING));
+		setPrivate(extractField(frameHeader, BITMASK_PRIVATE));
+		setChannelMode(extractField(frameHeader, BITMASK_CHANNEL_MODE));
+		setModeExtension(extractField(frameHeader, BITMASK_MODE_EXTENSION));
+		setCopyright(extractField(frameHeader, BITMASK_COPYRIGHT));
+		setOriginal(extractField(frameHeader, BITMASK_ORIGINAL));
+		setEmphasis(extractField(frameHeader, BITMASK_EMPHASIS));
+	}
+
+	protected int extractField(long frameHeader, long bitMask) {
+		int shiftBy = 0;
+		for (int i = 0; i <= 31; i++) {
+			if (((bitMask >> i) & 1) != 0) {
+				shiftBy = i;
+				break;
+			}
+		}
+		return (int) ((frameHeader >> shiftBy) & (bitMask >> shiftBy));
+	}
+
+	private void setVersion(int version) throws InvalidDataException {
+		switch (version) {
+			case 0:
+				this.version = MPEG_VERSION_2_5;
+				break;
+			case 2:
+				this.version = MPEG_VERSION_2_0;
+				break;
+			case 3:
+				this.version = MPEG_VERSION_1_0;
+				break;
+			default:
+				throw new InvalidDataException("Invalid mpeg audio version in frame header");
+		}
+	}
+
+	private void setLayer(int layer) throws InvalidDataException {
+		switch (layer) {
+			case 1:
+				this.layer = 3;
+				break;
+			case 2:
+				this.layer = 2;
+				break;
+			case 3:
+				this.layer = 1;
+				break;
+			default:
+				throw new InvalidDataException("Invalid mpeg layer description in frame header");
+		}
+	}
+
+	private void setProtection(int protectionBit) {
+		this.protection = (protectionBit == 1);
+	}
+
+	private void setBitRate(int bitrate) throws InvalidDataException {
+		if (MPEG_VERSION_1_0.equals(version)) {
+			if (layer == 1) {
+				switch (bitrate) {
+					case 1:
+						this.bitrate = 32;
+						return;
+					case 2:
+						this.bitrate = 64;
+						return;
+					case 3:
+						this.bitrate = 96;
+						return;
+					case 4:
+						this.bitrate = 128;
+						return;
+					case 5:
+						this.bitrate = 160;
+						return;
+					case 6:
+						this.bitrate = 192;
+						return;
+					case 7:
+						this.bitrate = 224;
+						return;
+					case 8:
+						this.bitrate = 256;
+						return;
+					case 9:
+						this.bitrate = 288;
+						return;
+					case 10:
+						this.bitrate = 320;
+						return;
+					case 11:
+						this.bitrate = 352;
+						return;
+					case 12:
+						this.bitrate = 384;
+						return;
+					case 13:
+						this.bitrate = 416;
+						return;
+					case 14:
+						this.bitrate = 448;
+						return;
+				}
+			} else if (layer == 2) {
+				switch (bitrate) {
+					case 1:
+						this.bitrate = 32;
+						return;
+					case 2:
+						this.bitrate = 48;
+						return;
+					case 3:
+						this.bitrate = 56;
+						return;
+					case 4:
+						this.bitrate = 64;
+						return;
+					case 5:
+						this.bitrate = 80;
+						return;
+					case 6:
+						this.bitrate = 96;
+						return;
+					case 7:
+						this.bitrate = 112;
+						return;
+					case 8:
+						this.bitrate = 128;
+						return;
+					case 9:
+						this.bitrate = 160;
+						return;
+					case 10:
+						this.bitrate = 192;
+						return;
+					case 11:
+						this.bitrate = 224;
+						return;
+					case 12:
+						this.bitrate = 256;
+						return;
+					case 13:
+						this.bitrate = 320;
+						return;
+					case 14:
+						this.bitrate = 384;
+						return;
+				}
+			} else if (layer == 3) {
+				switch (bitrate) {
+					case 1:
+						this.bitrate = 32;
+						return;
+					case 2:
+						this.bitrate = 40;
+						return;
+					case 3:
+						this.bitrate = 48;
+						return;
+					case 4:
+						this.bitrate = 56;
+						return;
+					case 5:
+						this.bitrate = 64;
+						return;
+					case 6:
+						this.bitrate = 80;
+						return;
+					case 7:
+						this.bitrate = 96;
+						return;
+					case 8:
+						this.bitrate = 112;
+						return;
+					case 9:
+						this.bitrate = 128;
+						return;
+					case 10:
+						this.bitrate = 160;
+						return;
+					case 11:
+						this.bitrate = 192;
+						return;
+					case 12:
+						this.bitrate = 224;
+						return;
+					case 13:
+						this.bitrate = 256;
+						return;
+					case 14:
+						this.bitrate = 320;
+						return;
+				}
+			}
+		} else if (MPEG_VERSION_2_0.equals(version) || MPEG_VERSION_2_5.equals(version)) {
+			if (layer == 1) {
+				switch (bitrate) {
+					case 1:
+						this.bitrate = 32;
+						return;
+					case 2:
+						this.bitrate = 48;
+						return;
+					case 3:
+						this.bitrate = 56;
+						return;
+					case 4:
+						this.bitrate = 64;
+						return;
+					case 5:
+						this.bitrate = 80;
+						return;
+					case 6:
+						this.bitrate = 96;
+						return;
+					case 7:
+						this.bitrate = 112;
+						return;
+					case 8:
+						this.bitrate = 128;
+						return;
+					case 9:
+						this.bitrate = 144;
+						return;
+					case 10:
+						this.bitrate = 160;
+						return;
+					case 11:
+						this.bitrate = 176;
+						return;
+					case 12:
+						this.bitrate = 192;
+						return;
+					case 13:
+						this.bitrate = 224;
+						return;
+					case 14:
+						this.bitrate = 256;
+						return;
+				}
+			} else if (layer == 2 || layer == 3) {
+				switch (bitrate) {
+					case 1:
+						this.bitrate = 8;
+						return;
+					case 2:
+						this.bitrate = 16;
+						return;
+					case 3:
+						this.bitrate = 24;
+						return;
+					case 4:
+						this.bitrate = 32;
+						return;
+					case 5:
+						this.bitrate = 40;
+						return;
+					case 6:
+						this.bitrate = 48;
+						return;
+					case 7:
+						this.bitrate = 56;
+						return;
+					case 8:
+						this.bitrate = 64;
+						return;
+					case 9:
+						this.bitrate = 80;
+						return;
+					case 10:
+						this.bitrate = 96;
+						return;
+					case 11:
+						this.bitrate = 112;
+						return;
+					case 12:
+						this.bitrate = 128;
+						return;
+					case 13:
+						this.bitrate = 144;
+						return;
+					case 14:
+						this.bitrate = 160;
+						return;
+				}
+			}
+		}
+		throw new InvalidDataException("Invalid bitrate in frame header");
+	}
+
+	private void setSampleRate(int sampleRate) throws InvalidDataException {
+		if (MPEG_VERSION_1_0.equals(version)) {
+			switch (sampleRate) {
+				case 0:
+					this.sampleRate = 44100;
+					return;
+				case 1:
+					this.sampleRate = 48000;
+					return;
+				case 2:
+					this.sampleRate = 32000;
+					return;
+			}
+		} else if (MPEG_VERSION_2_0.equals(version)) {
+			switch (sampleRate) {
+				case 0:
+					this.sampleRate = 22050;
+					return;
+				case 1:
+					this.sampleRate = 24000;
+					return;
+				case 2:
+					this.sampleRate = 16000;
+					return;
+			}
+		} else if (MPEG_VERSION_2_5.equals(version)) {
+			switch (sampleRate) {
+				case 0:
+					this.sampleRate = 11025;
+					return;
+				case 1:
+					this.sampleRate = 12000;
+					return;
+				case 2:
+					this.sampleRate = 8000;
+					return;
+			}
+		}
+		throw new InvalidDataException("Invalid sample rate in frame header");
+	}
+
+	private void setPadding(int paddingBit) {
+		this.padding = (paddingBit == 1);
+	}
+
+	private void setPrivate(int privateBit) {
+		this.privat = (privateBit == 1);
+	}
+
+	private void setChannelMode(int channelMode) throws InvalidDataException {
+		switch (channelMode) {
+			case 0:
+				this.channelMode = CHANNEL_MODE_STEREO;
+				break;
+			case 1:
+				this.channelMode = CHANNEL_MODE_JOINT_STEREO;
+				break;
+			case 2:
+				this.channelMode = CHANNEL_MODE_DUAL_MONO;
+				break;
+			case 3:
+				this.channelMode = CHANNEL_MODE_MONO;
+				break;
+			default:
+				throw new InvalidDataException("Invalid channel mode in frame header");
+		}
+	}
+
+	private void setModeExtension(int modeExtension) throws InvalidDataException {
+		if (!CHANNEL_MODE_JOINT_STEREO.equals(channelMode)) {
+			this.modeExtension = MODE_EXTENSION_NA;
+		} else {
+			if (layer == 1 || layer == 2) {
+				switch (modeExtension) {
+					case 0:
+						this.modeExtension = MODE_EXTENSION_BANDS_4_31;
+						return;
+					case 1:
+						this.modeExtension = MODE_EXTENSION_BANDS_8_31;
+						return;
+					case 2:
+						this.modeExtension = MODE_EXTENSION_BANDS_12_31;
+						return;
+					case 3:
+						this.modeExtension = MODE_EXTENSION_BANDS_16_31;
+						return;
+				}
+			} else if (layer == 3) {
+				switch (modeExtension) {
+					case 0:
+						this.modeExtension = MODE_EXTENSION_NONE;
+						return;
+					case 1:
+						this.modeExtension = MODE_EXTENSION_INTENSITY_STEREO;
+						return;
+					case 2:
+						this.modeExtension = MODE_EXTENSION_M_S_STEREO;
+						return;
+					case 3:
+						this.modeExtension = MODE_EXTENSION_INTENSITY_M_S_STEREO;
+						return;
+				}
+			}
+			throw new InvalidDataException("Invalid mode extension in frame header");
+		}
+	}
+
+	private void setCopyright(int copyrightBit) {
+		this.copyright = (copyrightBit == 1);
+	}
+
+	private void setOriginal(int originalBit) {
+		this.original = (originalBit == 1);
+	}
+
+	private void setEmphasis(int emphasis) throws InvalidDataException {
+		switch (emphasis) {
+			case 0:
+				this.emphasis = EMPHASIS_NONE;
+				break;
+			case 1:
+				this.emphasis = EMPHASIS__50_15_MS;
+				break;
+			case 3:
+				this.emphasis = EMPHASIS_CCITT_J_17;
+				break;
+			default:
+				throw new InvalidDataException("Invalid emphasis in frame header");
+		}
+	}
+
+	public int getBitrate() {
+		return bitrate;
+	}
+
+	public String getChannelMode() {
+		return channelMode;
+	}
+
+	public boolean isCopyright() {
+		return copyright;
+	}
+
+	public String getEmphasis() {
+		return emphasis;
+	}
+
+	public String getLayer() {
+		return MPEG_LAYERS[layer];
+	}
+
+	public String getModeExtension() {
+		return modeExtension;
+	}
+
+	public boolean isOriginal() {
+		return original;
+	}
+
+	public boolean hasPadding() {
+		return padding;
+	}
+
+	public boolean isPrivate() {
+		return privat;
+	}
+
+	public boolean isProtection() {
+		return protection;
+	}
+
+	public int getSampleRate() {
+		return sampleRate;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public int getLengthInBytes() {
+		long length;
+		int pad;
+		if (padding) pad = 1;
+		else pad = 0;
+		if (layer == 1) {
+			length = ((48000 * bitrate) / sampleRate) + (pad * 4);
+		} else {
+			length = ((144000 * bitrate) / sampleRate) + pad;
+		}
+		return (int) length;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/MutableInteger.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/MutableInteger.java
new file mode 100644
index 0000000..2423d3c
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/MutableInteger.java
@@ -0,0 +1,44 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class MutableInteger {
+
+	private int value;
+
+	public MutableInteger(int value) {
+		this.value = value;
+	}
+
+	public void increment() {
+		value++;
+	}
+
+	public int getValue() {
+		return value;
+	}
+
+	public void setValue(int value) {
+		this.value = value;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + value;
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		MutableInteger other = (MutableInteger) obj;
+		if (value != other.value)
+			return false;
+		return true;
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/NoSuchTagException.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/NoSuchTagException.java
new file mode 100644
index 0000000..f943ac0
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/NoSuchTagException.java
@@ -0,0 +1,18 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class NoSuchTagException extends BaseException {
+
+	private static final long serialVersionUID = 1L;
+
+	public NoSuchTagException() {
+		super();
+	}
+
+	public NoSuchTagException(String message) {
+		super(message);
+	}
+
+	public NoSuchTagException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/NotSupportedException.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/NotSupportedException.java
new file mode 100644
index 0000000..c9e0acf
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/NotSupportedException.java
@@ -0,0 +1,18 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class NotSupportedException extends BaseException {
+
+	private static final long serialVersionUID = 1L;
+
+	public NotSupportedException() {
+		super();
+	}
+
+	public NotSupportedException(String message) {
+		super(message);
+	}
+
+	public NotSupportedException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/UnsupportedTagException.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/UnsupportedTagException.java
new file mode 100644
index 0000000..ae2fcd4
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/UnsupportedTagException.java
@@ -0,0 +1,18 @@
+package com.example.spotifydownloader.mp3agic;
+
+public class UnsupportedTagException extends BaseException {
+
+	private static final long serialVersionUID = 1L;
+
+	public UnsupportedTagException() {
+		super();
+	}
+
+	public UnsupportedTagException(String message) {
+		super(message);
+	}
+
+	public UnsupportedTagException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
diff --git a/app/src/main/java/com/example/spotifydownloader/mp3agic/Version.java b/app/src/main/java/com/example/spotifydownloader/mp3agic/Version.java
new file mode 100644
index 0000000..5d114e3
--- /dev/null
+++ b/app/src/main/java/com/example/spotifydownloader/mp3agic/Version.java
@@ -0,0 +1,25 @@
+package com.example.spotifydownloader.mp3agic;
+
+public final class Version {
+	private static final String VERSION;
+	private static final String URL = "http://github.com/mpatric/mp3agic";
+
+	static { // get version from JAR manifest
+		String implementationVersion = Version.class.getPackage().getImplementationVersion();
+		VERSION = implementationVersion != null ? implementationVersion : "UNKNOWN-SNAPSHOT";
+	}
+
+	private Version() {}
+
+	public static String asString() {
+		return getVersion() + " - " + getUrl();
+	}
+
+	public static String getVersion() {
+		return VERSION;
+	}
+
+	public static String getUrl() {
+		return URL;
+	}
+}
diff --git a/app/src/main/python/main.py b/app/src/main/python/main.py
index 8cc1437..f4beef8 100644
--- a/app/src/main/python/main.py
+++ b/app/src/main/python/main.py
@@ -138,6 +138,7 @@ def insertMetaData(songs,fileLocation):
 
 
         tracks = sp.search(songs)
+
         ArtWorkURL = tracks['tracks']['items'][0]['album']['images'][0]['url']
         songId = songSearch['result'][0]['id']
         songTitle = songSearch['result'][0]['title']
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e703154..b638ee4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,7 +15,7 @@
             android:id="@+id/fragment"
             android:name="androidx.navigation.fragment.NavHostFragment"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             app:defaultNavHost="true"
             app:navGraph="@navigation/my_nav"
 
diff --git a/app/src/main/res/layout/fragment_album.xml b/app/src/main/res/layout/fragment_album.xml
index 78207d0..00708d3 100644
--- a/app/src/main/res/layout/fragment_album.xml
+++ b/app/src/main/res/layout/fragment_album.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".albumFragment">
+    tools:context=".Fragments.albumFragment">
 
     <TextView
         android:id="@+id/permissionTextAB"
diff --git a/app/src/main/res/layout/fragment_download.xml b/app/src/main/res/layout/fragment_download.xml
index beb2006..8ddf112 100644
--- a/app/src/main/res/layout/fragment_download.xml
+++ b/app/src/main/res/layout/fragment_download.xml
@@ -4,14 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".downloadFragment">
+    tools:context=".Fragments.downloadFragment">
 
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/fabButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -19,11 +19,14 @@
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/fabButton"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+
         android:text="Cancel"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"/>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_play_list.xml b/app/src/main/res/layout/fragment_play_list.xml
index c463bf3..8f60a9f 100644
--- a/app/src/main/res/layout/fragment_play_list.xml
+++ b/app/src/main/res/layout/fragment_play_list.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".playListFragment">
+    tools:context=".Fragments.playListFragment">
 
     <TextView
         android:id="@+id/permissionTextPLF"
diff --git a/app/src/main/res/layout/fragment_song.xml b/app/src/main/res/layout/fragment_song.xml
index 195bf30..4f27235 100644
--- a/app/src/main/res/layout/fragment_song.xml
+++ b/app/src/main/res/layout/fragment_song.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".SongFragment">
+    tools:context=".Fragments.SongFragment">
 
     <TextView
         android:id="@+id/permissionText"
diff --git a/app/src/main/res/layout/fragment_song_download.xml b/app/src/main/res/layout/fragment_song_download.xml
new file mode 100644
index 0000000..070b28d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_song_download.xml
@@ -0,0 +1,54 @@
+<?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"
+    tools:context=".Fragments.SongDownloadFragment">
+
+    <ImageView
+        android:id="@+id/albumCover"
+        android:layout_width="250dp"
+        android:layout_height="250dp"
+        android:layout_marginTop="80dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <TextView
+        android:id="@+id/songName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="25dp"
+        android:textAlignment="center"
+        android:textSize="25sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/albumCover" />
+
+    <TextView
+
+        android:id="@+id/artistName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:textAlignment="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/songName" />
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/artistName" />
+
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/my_nav.xml b/app/src/main/res/navigation/my_nav.xml
index 0f0d2e1..198b74f 100644
--- a/app/src/main/res/navigation/my_nav.xml
+++ b/app/src/main/res/navigation/my_nav.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/playListFragment"
-        android:name="com.example.spotifydownloader.playListFragment"
+        android:name="com.example.spotifydownloader.Fragments.playListFragment"
         android:label="fragment_play_list"
         tools:layout="@layout/fragment_play_list" >
         <action
@@ -20,7 +20,7 @@
     </fragment>
     <fragment
         android:id="@+id/albumFragment"
-        android:name="com.example.spotifydownloader.albumFragment"
+        android:name="com.example.spotifydownloader.Fragments.albumFragment"
         android:label="fragment_album"
         tools:layout="@layout/fragment_album" >
         <action
@@ -33,19 +33,37 @@
     </fragment>
     <fragment
         android:id="@+id/songFragment"
-        android:name="com.example.spotifydownloader.SongFragment"
+        android:name="com.example.spotifydownloader.Fragments.SongFragment"
         android:label="fragment_song"
         tools:layout="@layout/fragment_song" >
 
+        <action
+            android:id="@+id/action_songFragment_to_songDownloadFragment"
+            app:destination="@id/songDownloadFragment"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"/>
     </fragment>
     <fragment
         android:id="@+id/downloadFragment"
-        android:name="com.example.spotifydownloader.downloadFragment"
+        android:name="com.example.spotifydownloader.Fragments.downloadFragment"
         android:label="fragment_download"
         tools:layout="@layout/fragment_download" >
 
+
         <argument
             android:name="Data"
             app:argType="com.example.spotifydownloader.model.Data" />
+
+    </fragment>
+    <fragment
+        android:id="@+id/songDownloadFragment"
+        android:name="com.example.spotifydownloader.Fragments.SongDownloadFragment"
+        android:label="fragment_song_download"
+        tools:layout="@layout/fragment_song_download" >
+        <argument
+            android:name="DataSearch"
+            app:argType="com.example.spotifydownloader.model.DataSearch" />
     </fragment>
 </navigation>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index dce30e2..89bb50b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
-    id 'com.chaquo.python' version '14.0.2' apply false
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 3c5031e..a2e90d8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f04f62c..7a8ceeb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Mar 20 21:18:15 EET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME