diff --git a/app/app.iml b/app/app.iml
index d38a2b1..e448938 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -30,7 +30,7 @@
       </configuration>
     </facet>
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
+      <configuration version="3" platform="JVM 1.8" allPlatforms="JVM [1.8]" useProjectSettings="false">
         <compilerSettings />
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
@@ -38,6 +38,7 @@
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
+          <option name="jvmTarget" value="1.8" />
           <option name="languageVersion" value="1.3" />
           <option name="apiVersion" value="1.3" />
           <option name="pluginOptions">
diff --git a/app/build.gradle b/app/build.gradle
index 52179fe..11feafe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,6 +38,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
     externalNativeBuild {
         cmake {
             path "src/main/cpp/CMakeLists.txt"
diff --git a/app/src/main/java/com/example/mear/activities/BaseServiceActivity.kt b/app/src/main/java/com/example/mear/activities/BaseServiceActivity.kt
index 6f831ac..eb44476 100644
--- a/app/src/main/java/com/example/mear/activities/BaseServiceActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/BaseServiceActivity.kt
@@ -5,7 +5,6 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
-import android.os.Bundle
 import android.os.Environment
 import android.os.IBinder
 import androidx.appcompat.app.AppCompatActivity
diff --git a/app/src/main/java/com/example/mear/activities/LoginActivity.kt b/app/src/main/java/com/example/mear/activities/LoginActivity.kt
index f9839d7..58ebf88 100644
--- a/app/src/main/java/com/example/mear/activities/LoginActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/LoginActivity.kt
@@ -16,6 +16,7 @@ class LoginActivity : BaseServiceActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        window.statusBarColor = resources.getColor(R.color.track_seek)
         setContentView(R.layout.activity_login)
         setSupportActionBar(toolbar)
 
diff --git a/app/src/main/java/com/example/mear/activities/MainActivity.kt b/app/src/main/java/com/example/mear/activities/MainActivity.kt
index 15aa7d5..3002b23 100644
--- a/app/src/main/java/com/example/mear/activities/MainActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/MainActivity.kt
@@ -11,25 +11,19 @@ import kotlinx.android.synthetic.main.fragment_track_details.*
 import kotlinx.android.synthetic.main.fragment_track_elapsing.*
 import kotlinx.android.synthetic.main.fragment_track_flow.*
 
-import android.Manifest
-import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Bundle
 import android.os.Handler
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
 import android.view.MenuItem
 import android.view.View
 import android.widget.PopupMenu
 import android.widget.Toast
-/**
+import androidx.lifecycle.Observer
 import androidx.work.Data
 import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
-*/
 import org.jetbrains.anko.image
 import org.jetbrains.anko.imageBitmap
 
@@ -39,18 +33,14 @@ import com.example.mear.repositories.*
 import com.example.mear.repositories.RepeatRepository.RepeatTypes
 import com.example.mear.repositories.ShuffleRepository.ShuffleTypes
 import com.example.mear.util.ConvertByteArray
-// import com.example.mear.workers.IcarusSyncManager
+import com.example.mear.workers.IcarusSyncManager
 
 
 class MainActivity : BaseServiceActivity() {
 
-    private val ctx: Context? = this
-    private var coverArtHandler: Handler? = Handler()
     private var musicHandler: Handler? = Handler()
-    private var updateLibraryHandler: Handler? = Handler()
     private var playCountUpdated: Boolean? = false
     private var serviceBinded: Boolean? = false
-    private var metadataInitialized: Boolean = false
     private var repeatOn: Boolean? = false
     private var shuffleOn: Boolean? = false
 
@@ -58,18 +48,6 @@ class MainActivity : BaseServiceActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         try {
-            /**
-            val workManager = WorkManager.getInstance()
-
-            val constraints = androidx.work.Constraints.Builder()
-                .setRequiredNetworkType(NetworkType.CONNECTED).build()
-
-            val task = OneTimeWorkRequest.Builder(IcarusSyncManager::class.java)
-                .setConstraints(constraints).build()
-            workManager.enqueue(task)
-            */
-
-
             setContentView(R.layout.activity_main)
             setSupportActionBar(toolbar)
 
@@ -354,22 +332,6 @@ class MainActivity : BaseServiceActivity() {
         return true
     }
 
-    // TODO: Might need this down the road for playing songs off an external
-    // storage
-    private fun permissionPrompt() {
-        if (ContextCompat.checkSelfPermission(this,
-                Manifest.permission.READ_EXTERNAL_STORAGE)
-            != PackageManager.PERMISSION_GRANTED) {
-
-            if (ActivityCompat.shouldShowRequestPermissionRationale(this,
-                    Manifest.permission.READ_EXTERNAL_STORAGE)) {
-            }
-            else {
-                ActivityCompat.requestPermissions(this,
-                    arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 0)
-            }
-        }
-    }
 
     private fun showPopup(view: View) {
         try {
@@ -390,12 +352,9 @@ class MainActivity : BaseServiceActivity() {
                         startActivity(Intent(this, IcarusSongActivity::class.java))
                     }
                     R.id.action_song_delete -> {
-                        // TODO: handle song deletion
-                        val ss = true
                         val appPath = appDirectory()
                         val trackRepo = TrackRepository()
-                        // The method I am calling has not been implemented on the C++
-                        // side
+
                         var currSong = musicService!!.getCurrentSong()
                         Toast.makeText(this, "Deleting song", Toast.LENGTH_SHORT).show()
                         val result = trackRepo.delete(currSong, appPath)
@@ -405,46 +364,49 @@ class MainActivity : BaseServiceActivity() {
                     }
                     R.id.action_song_download -> {
                         val appPath = appDirectory()
-                        val apiRepo = APIRepository()
-                        val tokenRepo = TokenRepository()
-                        val trackRepo = TrackRepository()
                         var song = musicService!!.getCurrentSong()
 
-                        val token = tokenRepo.retrieveToken(appPath)
-                        // val apiInfo = apiRepo.retrieveRecord(appPath)
-                        // song = trackRepo.download(token, song, appPath)
-                        // musicService!!.changeSongDownloadStatus(song)
-                        // TODO: implement something to include the downloaded song into the songQueue
-                        // essentially replacing the song that already exists, that way one can
-                        // actually access the file without having to restart the app
                         Toast.makeText(this, "Downloading song", Toast.LENGTH_SHORT).show()
 
-                        // val dMgr = IcarusSyncManager
-                        musicService!!.downloadSong(token, song, appPath)
-
-
-                        //val workManager = WorkManager.getInstance()
-                        /**
                         val constraints = androidx.work.Constraints.Builder()
                             .setRequiredNetworkType(NetworkType.CONNECTED).build()
 
-                        val task = OneTimeWorkRequest.Builder(IcarusSyncManager::class.java)
-                            .setConstraints(constraints)
                         val data = Data.Builder()
-                        data.putString("accessToken", token.accessToken)
                         data.putString("appPath", appPath)
+
                         data.putInt("songId", song.id)
-                        task.setInputData(data.build())
-                        */
-                        //workManager.enqueue(task)
-                        //WorkManager.getInstance().enqueue(task.build())
+                        data.putString("songTitle", song.title)
+                        data.putString("songArtist", song.artist)
+                        data.putString("songAlbum", song.album)
+                        data.putString("songAlbumArtist", song.albumArtist)
+                        data.putString("songGenre", song.genre)
+                        data.putInt("songYear", song.year)
+                        data.putInt("songDuration", song.duration)
+                        data.putInt("songCoverArtId", song.coverArtId)
+                        data.putBoolean("songDownloaded", false)
+                        data.putInt("songDisc", song.disc)
+                        data.putInt("songTrack", song.track)
+
+                        val task = OneTimeWorkRequest.Builder(IcarusSyncManager::class.java)
+                            .setInputData(data.build())
+                            .setConstraints(constraints)
+                            .build()
+                        WorkManager.getInstance().enqueue(task)
+
+                        WorkManager.getInstance(this).getWorkInfoByIdLiveData(task.id)
+                            .observe(this, Observer { info ->
+                                if (info != null && info.state.isFinished) {
+                                    song.path = info.outputData.getString("songPath")!!
+                                    song.filename = info.outputData.getString("songFilename")!!
+                                    song.downloaded = info.outputData.getBoolean("songDownloaded", true)!!
+                                    musicService!!.changeSongDownloadStatus(song)
+                                }
+                            })
                     }
                     /**
                     R.id.action_song_play_count-> {
                         // TODO: not implemented
                         val trk = musicService!!.getCurrentSong()
-                        // val pc = PlayCountRepository(this).getPlayCount(trk.id)
-                        // val playCount = pc.playCount
                         Toast.makeText(this, "Song played $playCount times", Toast.LENGTH_LONG).show()
                     }
                     */
diff --git a/app/src/main/java/com/example/mear/playback/service/MusicService.kt b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
index cd3baa4..05294fb 100644
--- a/app/src/main/java/com/example/mear/playback/service/MusicService.kt
+++ b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
@@ -87,7 +87,7 @@ class MusicService(var appPath: String = ""): Service() {
         try {
             trackPlayer!!.reset()
             trackPlayer!!.setDataSource(this, uri, hddr)
-            trackPlayer!!.prepareAsync()
+            trackPlayer!!.prepare()
             trackPlayer!!.start()
         }
         catch (ex: Exception) {
@@ -102,14 +102,13 @@ class MusicService(var appPath: String = ""): Service() {
         currentSong = song
         currentSongIndex = songQueue.indexOfFirst { it.id == currentSong.id }
         songQueue[currentSongIndex!!] = currentSong
-        /**
+
         val curPosition = currentPositionOfTrack()
         trackPlayer!!.reset()
         trackPlayer!!.setDataSource(currentSong.path)
-        trackPlayer!!.prepareAsync()
+        trackPlayer!!.prepare()
         trackPlayer!!.seekTo(curPosition)
         trackPlayer!!.start()
-        */
     }
 
     fun removeSongDownloadStatus(song: Song) {
@@ -179,7 +178,7 @@ class MusicService(var appPath: String = ""): Service() {
                         uri, hddr)
                 }
 
-                trackPlayer!!.prepareAsync()
+                trackPlayer!!.prepare()
                 trackPlayer!!.start()
             }
         }
@@ -216,7 +215,7 @@ class MusicService(var appPath: String = ""): Service() {
                     APIRepository.retrieveSongStreamUri(apiInfo, currentSong),
                     APIRepository.retrieveSongStreamHeader(token))
             }
-            trackPlayer!!.prepareAsync()
+            trackPlayer!!.prepare()
             trackPlayer!!.start()
         }
         catch (ex: Exception) {
@@ -266,7 +265,7 @@ class MusicService(var appPath: String = ""): Service() {
                     APIRepository.retrieveSongStreamHeader(token))
             }
 
-            trackPlayer!!.prepareAsync()
+            trackPlayer!!.prepare()
             trackPlayer!!.setOnCompletionListener {
                 playNextTrack()
             }
@@ -302,7 +301,7 @@ class MusicService(var appPath: String = ""): Service() {
 
             trackPlayer!!.reset()
             trackPlayer!!.setDataSource(song.path)
-            trackPlayer!!.prepareAsync()
+            trackPlayer!!.prepare()
             trackPlayer!!.start()
         }
         catch (ex: Exception) {
diff --git a/app/src/main/java/com/example/mear/workers/IcarusSync.kt b/app/src/main/java/com/example/mear/workers/IcarusSync.kt
index 3ce6e3e..2b15c3e 100644
--- a/app/src/main/java/com/example/mear/workers/IcarusSync.kt
+++ b/app/src/main/java/com/example/mear/workers/IcarusSync.kt
@@ -1,21 +1,46 @@
 package com.example.mear.workers
 
 import android.content.Context
+import androidx.work.Data
 import androidx.work.Worker
 import androidx.work.WorkerParameters
+import androidx.work.workDataOf
 
+import com.example.mear.models.Song
+import com.example.mear.repositories.TokenRepository
+import com.example.mear.repositories.TrackRepository
 
 class IcarusSyncManager(context: Context, workerParams: WorkerParameters) :
     Worker(context, workerParams) {
     override fun doWork(): Result {
-        //TODO perform your async operational task here
-        /**
-         * We have performed download task here on above example
-         */
-        val accessToken = inputData.getString("accessToken")
-        val appPath = inputData.getString("appPath")
-        //val songId = inputData.getInt("songId")
+        val appPath: String = inputData.getString("appPath")!!
+        val songId = inputData.getInt("songId", 0)
+        if (songId == 0) {
+            return Result.failure()
+        }
 
-        return Result.success()
+        val tokenRepo = TokenRepository()
+        val trackRepo = TrackRepository()
+        val tok = tokenRepo.retrieveToken(appPath)
+        val song = Song()
+        song.id = songId
+        song.title = inputData.getString("songTitle")!!
+        song.artist = inputData.getString("songArtist")!!
+        song.album = inputData.getString("songAlbum")!!
+        song.albumArtist = inputData.getString("songAlbumArtist")!!
+        song.genre = inputData.getString("songGenre")!!
+        song.year = inputData.getInt("songYear", 0)
+        song.duration = inputData.getInt("songDuration", 0)
+        song.coverArtId = inputData.getInt("songCoverArtId", 0)
+        song.disc = inputData.getInt("songDisc", 0)
+        song.track = inputData.getInt("songTrack", 0)
+
+        val downloadedSong = trackRepo.download(tok, song, appPath)
+
+        val output: Data = workDataOf("songPath" to downloadedSong.path,
+            "songFilename" to downloadedSong.filename,
+            "songDownloaded" to true)
+
+        return Result.success(output)
     }
 }
\ No newline at end of file