diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
index 529728af7..8c80992e5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
@@ -88,7 +88,7 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C
 
     private lateinit var simpleSongAdapter: SimpleSongAdapter
     private lateinit var album: Album
-    private lateinit var songs: ArrayList<Song>
+    private lateinit var songs: List<Song>
     private var cab: MaterialCab? = null
 
     private val savedSortOrder: String
@@ -193,17 +193,17 @@ class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, C
             albumText.text = String.format("%s • %s", album.artist, MusicUtil.getYearString(album.year))
         }
         loadAlbumCover()
-        albumDetailsPresenter.albumSong(album.id)
+        albumDetailsPresenter.albumSongs(album.id)
         albumDetailsPresenter.loadMore(album.artistId)
         albumDetailsPresenter.aboutAlbum(album.artist, album.title)
     }
 
-    override fun songs(songs: ArrayList<Song>) {
+    override fun songs(songs: List<Song>) {
         this.songs = songs
         simpleSongAdapter.swapDataSet(songs)
     }
 
-    override fun moreAlbums(albums: ArrayList<Album>) {
+    override fun moreAlbums(albums: List<Album>) {
         moreTitle.show()
         moreRecyclerView.show()
         moreTitle.text = String.format(getString(R.string.label_more_from), album.artist)
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
index 23d0b8510..b9238f83e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
@@ -129,7 +129,7 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDet
         })
     }
 
-    override fun songs(songs: ArrayList<Song>) {
+    override fun songs(songs: List<Song>) {
         songAdapter.swapDataSet(songs)
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
index f09afd9ab..ab22a62e1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
@@ -238,7 +238,7 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
         emptyText.visibility = View.VISIBLE
     }
 
-    override fun songs(songs: ArrayList<Song>) {
+    override fun songs(songs: List<Song>) {
         adapter.swapDataSet(songs)
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
index ae5ed811c..2b888ed94 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
@@ -9,7 +9,6 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.model.Genre
 import code.name.monkey.retromusic.util.NavigationUtil
-import java.util.ArrayList
 import java.util.Locale
 
 /**
@@ -18,11 +17,11 @@ import java.util.Locale
 
 class GenreAdapter(
     private val activity: Activity,
-    dataSet: ArrayList<Genre>,
+    dataSet: List<Genre>,
     private val mItemLayoutRes: Int
 ) : RecyclerView.Adapter<GenreAdapter.ViewHolder>() {
 
-    var dataSet = ArrayList<Genre>()
+    var dataSet = listOf<Genre>()
         private set
 
     init {
@@ -48,7 +47,7 @@ class GenreAdapter(
         return dataSet.size
     }
 
-    fun swapDataSet(list: ArrayList<Genre>) {
+    fun swapDataSet(list: List<Genre>) {
         dataSet = list
         notifyDataSetChanged()
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
index 45b650c95..80e56669c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
@@ -11,11 +11,10 @@ import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.util.MusicUtil
 import com.bumptech.glide.Glide
-import java.util.ArrayList
 
 class HorizontalAlbumAdapter(
     activity: AppCompatActivity,
-    dataSet: ArrayList<Album>,
+    dataSet: List<Album>,
     cabHolder: CabHolder?
 ) : AlbumAdapter(
     activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, cabHolder
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
index 6a710bda5..2b1ae68b4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
@@ -28,14 +28,14 @@ import java.util.ArrayList
 
 class ArtistAdapter(
     val activity: AppCompatActivity,
-    var dataSet: ArrayList<Artist>,
+    var dataSet: List<Artist>,
     var itemLayoutRes: Int,
     cabHolder: CabHolder?
 ) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(
     activity, cabHolder, R.menu.menu_media_selection
 ), PopupTextProvider {
 
-    fun swapDataSet(dataSet: ArrayList<Artist>) {
+    fun swapDataSet(dataSet: List<Artist>) {
         this.dataSet = dataSet
         notifyDataSetChanged()
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
index 28f11ab3d..3d76940de 100755
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
@@ -34,7 +34,7 @@ import java.util.ArrayList
 
 class PlaylistAdapter(
     private val activity: AppCompatActivity,
-    var dataSet: ArrayList<Playlist>,
+    var dataSet: List<Playlist>,
     private var itemLayoutRes: Int,
     cabHolder: CabHolder?
 ) : AbsMultiSelectAdapter<PlaylistAdapter.ViewHolder, Playlist>(
@@ -49,7 +49,7 @@ class PlaylistAdapter(
         setHasStableIds(true)
     }
 
-    fun swapDataSet(dataSet: ArrayList<Playlist>) {
+    fun swapDataSet(dataSet: List<Playlist>) {
         this.dataSet = dataSet
         notifyDataSetChanged()
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
index dad2f1e40..b002aefa2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
@@ -16,7 +16,7 @@ import javax.inject.Inject
 class ArtistsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<ArtistAdapter, GridLayoutManager>(),
     ArtistsView {
 
-    override fun artists(artists: ArrayList<Artist>) {
+    override fun artists(artists: List<Artist>) {
         adapter?.swapDataSet(artists)
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenresFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenresFragment.kt
index 4b66fd106..fc43f05b4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenresFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenresFragment.kt
@@ -26,14 +26,12 @@ import code.name.monkey.retromusic.mvp.presenter.GenresPresenter
 import code.name.monkey.retromusic.mvp.presenter.GenresView
 import javax.inject.Inject
 
-
 class GenresFragment : AbsLibraryPagerRecyclerViewFragment<GenreAdapter, LinearLayoutManager>(), GenresView {
-    override fun genres(genres: ArrayList<Genre>) {
+    override fun genres(genres: List<Genre>) {
         adapter?.swapDataSet(genres)
     }
 
     override fun showEmptyView() {
-
     }
 
     override fun createLayoutManager(): LinearLayoutManager {
@@ -48,11 +46,9 @@ class GenresFragment : AbsLibraryPagerRecyclerViewFragment<GenreAdapter, LinearL
     override val emptyMessage: Int
         get() = R.string.no_genres
 
-
     @Inject
     lateinit var genresPresenter: GenresPresenter
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         App.musicComponent.inject(this)
@@ -62,6 +58,7 @@ class GenresFragment : AbsLibraryPagerRecyclerViewFragment<GenreAdapter, LinearL
         super.onViewCreated(view, savedInstanceState)
         genresPresenter.attachView(this)
     }
+
     override fun onResume() {
         super.onResume()
         if (adapter!!.dataSet.isEmpty()) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt
index de76a10d9..3dc59be7b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt
@@ -63,7 +63,7 @@ class PlaylistsFragment : AbsLibraryPagerRecyclerViewFragment<PlaylistAdapter, L
         adapter?.swapDataSet(ArrayList())
     }
 
-    override fun playlists(playlists: ArrayList<Playlist>) {
+    override fun playlists(playlists: List<Playlist>) {
         adapter?.swapDataSet(playlists)
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
index c6a22582a..08db8976f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
@@ -49,7 +49,7 @@ class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdap
         )
     }
 
-    override fun songs(songs: ArrayList<Song>) {
+    override fun songs(songs: List<Song>) {
         adapter?.swapDataSet(songs)
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.kt
index 38d274f32..fd334a5b5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.kt
@@ -31,7 +31,7 @@ import android.provider.MediaStore.Audio.Media.EXTERNAL_CONTENT_URI as SONGS_URI
  * Created by hemanths on 11/08/17.
  */
 
-object AlbumLoader {
+object AlbumLoader  {
 
     fun getAllAlbums(context: Context): List<Album> {
         return makeAlbumCursor(context, null, null)
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.kt
index d02480e6a..08b2fd70c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.kt
@@ -14,9 +14,7 @@
 
 package code.name.monkey.retromusic.mvp.presenter
 
-import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.Result.Success
-import code.name.monkey.retromusic.loaders.AlbumLoader
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Song
@@ -39,15 +37,13 @@ interface AlbumDetailsView {
 
     fun album(album: Album)
 
-    fun songs(songs: ArrayList<Song>)
+    fun songs(songs: List<Song>)
 
     fun complete()
 
     fun loadArtistImage(artist: Artist)
 
-    fun moreAlbums(
-        albums: ArrayList<Album>
-    )
+    fun moreAlbums(albums: List<Album>)
 
     fun aboutAlbum(lastFmAlbum: LastFmAlbum)
 }
@@ -55,7 +51,7 @@ interface AlbumDetailsView {
 interface AlbumDetailsPresenter : Presenter<AlbumDetailsView> {
     fun loadAlbum(albumId: Long)
 
-    fun albumSong(albumId: Long)
+    fun albumSongs(albumId: Long)
 
     fun loadMore(artistId: Long)
 
@@ -88,10 +84,6 @@ interface AlbumDetailsPresenter : Presenter<AlbumDetailsView> {
 
         private fun showArtistImage(artist: Artist) {
             view?.loadArtistImage(artist)
-
-           /* artist.albums?.filter { it.id != album.id }?.let {
-                if (it.isNotEmpty()) view?.moreAlbums(ArrayList(it))
-            }*/
         }
 
         override fun loadAlbum(albumId: Long) {
@@ -106,11 +98,11 @@ interface AlbumDetailsPresenter : Presenter<AlbumDetailsView> {
             }
         }
 
-        override fun albumSong(albumId: Long) {
+        override fun albumSongs(albumId: Long) {
             launch {
-                val songs = AlbumLoader.getSongsForAlbum(App.getContext(), albumId)
-                withContext(Dispatchers.Main) {
-                    view.songs(songs)
+                when (val result = repository.albumSongsById(albumId)) {
+                    is Success -> withContext(Dispatchers.Main) { view.songs(result.data) }
+                    is Error -> withContext(Dispatchers.Main) {}
                 }
             }
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt
index 2f6ac1186..40f823417 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt
@@ -14,10 +14,7 @@
 
 package code.name.monkey.retromusic.mvp.presenter
 
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.Result
-import code.name.monkey.retromusic.loaders.AlbumLoader
-import code.name.monkey.retromusic.loaders.ArtistLoader
+import code.name.monkey.retromusic.Result.Success
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Song
@@ -77,12 +74,8 @@ interface ArtistDetailsPresenter : Presenter<ArtistDetailsView> {
         override fun loadBiography(name: String, lang: String?, cache: String?) {
             launch {
                 when (val result = repository.artistInfo(name, lang, cache)) {
-                    is Result.Success -> withContext(Dispatchers.Main) {
-                        view?.artistInfo(result.data)
-                    }
-                    is Result.Error -> withContext(Dispatchers.Main) {
-
-                    }
+                    is Success -> withContext(Dispatchers.Main) { view?.artistInfo(result.data) }
+                    is Error -> withContext(Dispatchers.Main) {}
                 }
             }
         }
@@ -90,31 +83,26 @@ interface ArtistDetailsPresenter : Presenter<ArtistDetailsView> {
         override fun loadArtist(artistId: Long) {
             launch {
                 when (val result = repository.artistById(artistId)) {
-                    is Result.Success -> withContext(Dispatchers.Main) {
-                        view?.artist(result.data)
-
-                    }
-                    is Result.Error -> withContext(Dispatchers.Main) {
-                        view?.showEmptyView()
-                    }
+                    is Success -> withContext(Dispatchers.Main) { view?.artist(result.data) }
+                    is Error -> withContext(Dispatchers.Main) { view?.showEmptyView() }
                 }
             }
         }
 
         override fun loadArtistSongs(artistId: Long) {
             launch {
-                val songs = ArtistLoader.getSongsForArtist(App.getContext(), artistId)
-                withContext(Dispatchers.Main) {
-                    view.songs(songs)
+                when (val result = repository.artistSongsById(artistId)) {
+                    is Success -> withContext(Dispatchers.Main) { view.songs(result.data) }
+                    is Error -> withContext(Dispatchers.Main) {}
                 }
             }
         }
 
         override fun loadArtistAlbums(artistId: Long) {
             launch {
-                val albums = AlbumLoader.getAlbumsForArtist(App.getContext(), artistId)
-                withContext(Dispatchers.Main) {
-                    view.albums(albums)
+                when (val result = repository.artistAlbumsById(artistId)) {
+                    is Success -> withContext(Dispatchers.Main) { view.albums(result.data) }
+                    is Error -> withContext(Dispatchers.Main) {}
                 }
             }
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.kt
index 7af0365e5..0ed1ed893 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.kt
@@ -20,12 +20,16 @@ import code.name.monkey.retromusic.mvp.BaseView
 import code.name.monkey.retromusic.mvp.Presenter
 import code.name.monkey.retromusic.mvp.PresenterImpl
 import code.name.monkey.retromusic.providers.interfaces.Repository
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
 
 interface ArtistsView : BaseView {
-    fun artists(artists: ArrayList<Artist>)
+    fun artists(artists: List<Artist>)
 }
 
 interface ArtistsPresenter : Presenter<ArtistsView> {
@@ -33,8 +37,9 @@ interface ArtistsPresenter : Presenter<ArtistsView> {
     fun loadArtists()
 
     class ArtistsPresenterImpl @Inject constructor(
-            private val repository: Repository
+        private val repository: Repository
     ) : PresenterImpl<ArtistsView>(), ArtistsPresenter, CoroutineScope {
+
         private val job = Job()
 
         override val coroutineContext: CoroutineContext
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt
index 4fe21bf7a..786c2e248 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt
@@ -20,26 +20,30 @@ import code.name.monkey.retromusic.mvp.BaseView
 import code.name.monkey.retromusic.mvp.Presenter
 import code.name.monkey.retromusic.mvp.PresenterImpl
 import code.name.monkey.retromusic.providers.interfaces.Repository
-import kotlinx.coroutines.*
-import java.util.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
 
-
 /**
  * Created by hemanths on 20/08/17.
  */
 
 interface GenreDetailsView : BaseView {
-    fun songs(songs: ArrayList<Song>)
+
+    fun songs(songs: List<Song>)
 }
 
 interface GenreDetailsPresenter : Presenter<GenreDetailsView> {
     fun loadGenreSongs(genreId: Int)
 
     class GenreDetailsPresenterImpl @Inject constructor(
-            private val repository: Repository
+        private val repository: Repository
     ) : PresenterImpl<GenreDetailsView>(), GenreDetailsPresenter, CoroutineScope {
+
         private val job = Job()
 
         override val coroutineContext: CoroutineContext
@@ -50,7 +54,6 @@ interface GenreDetailsPresenter : Presenter<GenreDetailsView> {
             job.cancel()
         }
 
-
         override fun loadGenreSongs(genreId: Int) {
             launch {
                 when (val result = repository.getGenre(genreId)) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.kt
index c929ab226..5ac89fb71 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.kt
@@ -20,8 +20,11 @@ import code.name.monkey.retromusic.mvp.BaseView
 import code.name.monkey.retromusic.mvp.Presenter
 import code.name.monkey.retromusic.mvp.PresenterImpl
 import code.name.monkey.retromusic.providers.interfaces.Repository
-import kotlinx.coroutines.*
-import java.util.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
 
@@ -29,15 +32,17 @@ import kotlin.coroutines.CoroutineContext
  * @author Hemanth S (h4h13).
  */
 interface GenresView : BaseView {
-    fun genres(genres: ArrayList<Genre>)
+
+    fun genres(genres: List<Genre>)
 }
 
 interface GenresPresenter : Presenter<GenresView> {
     fun loadGenres()
 
     class GenresPresenterImpl @Inject constructor(
-            private val repository: Repository
+        private val repository: Repository
     ) : PresenterImpl<GenresView>(), GenresPresenter, CoroutineScope {
+
         private val job = Job()
 
         override val coroutineContext: CoroutineContext
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.kt
index e41deeb76..e25bddd7e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.kt
@@ -16,19 +16,25 @@ package code.name.monkey.retromusic.mvp.presenter
 
 import code.name.monkey.retromusic.Result
 import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.mvp.*
+import code.name.monkey.retromusic.mvp.BaseView
+import code.name.monkey.retromusic.mvp.Presenter
+import code.name.monkey.retromusic.mvp.PresenterImpl
 import code.name.monkey.retromusic.providers.interfaces.Repository
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
 
-
 /**
  * Created by hemanths on 19/08/17.
  */
 
 interface PlaylistView : BaseView {
-    fun playlists(playlists: ArrayList<Playlist>)
+
+    fun playlists(playlists: List<Playlist>)
 }
 
 interface PlaylistsPresenter : Presenter<PlaylistView> {
@@ -36,7 +42,7 @@ interface PlaylistsPresenter : Presenter<PlaylistView> {
     fun playlists()
 
     class PlaylistsPresenterImpl @Inject constructor(
-            private val repository: Repository
+        private val repository: Repository
     ) : PresenterImpl<PlaylistView>(), PlaylistsPresenter, CoroutineScope {
 
         private val job = Job()
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt
index 407c4b83a..8a7234814 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt
@@ -15,10 +15,17 @@
 package code.name.monkey.retromusic.mvp.presenter
 
 import code.name.monkey.retromusic.Result
-import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.mvp.*
+import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.mvp.BaseView
+import code.name.monkey.retromusic.mvp.Presenter
+import code.name.monkey.retromusic.mvp.PresenterImpl
 import code.name.monkey.retromusic.providers.interfaces.Repository
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
 
@@ -26,14 +33,15 @@ import kotlin.coroutines.CoroutineContext
  * Created by hemanths on 20/08/17.
  */
 interface PlaylistSongsView : BaseView {
-    fun songs(songs: ArrayList<Song>)
+
+    fun songs(songs: List<Song>)
 }
 
 interface PlaylistSongsPresenter : Presenter<PlaylistSongsView> {
     fun loadPlaylistSongs(playlist: Playlist)
 
     class PlaylistSongsPresenterImpl @Inject constructor(
-            private val repository: Repository
+        private val repository: Repository
     ) : PresenterImpl<PlaylistSongsView>(), PlaylistSongsPresenter, CoroutineScope {
 
         private var job: Job = Job()
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.kt
index 89ab6351d..5879de46b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.kt
@@ -16,10 +16,14 @@ package code.name.monkey.retromusic.mvp.presenter
 
 import code.name.monkey.retromusic.Result
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.mvp.*
+import code.name.monkey.retromusic.mvp.Presenter
+import code.name.monkey.retromusic.mvp.PresenterImpl
 import code.name.monkey.retromusic.providers.interfaces.Repository
-import kotlinx.coroutines.*
-import java.util.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
 
@@ -27,36 +31,37 @@ import kotlin.coroutines.CoroutineContext
  * Created by hemanths on 10/08/17.
  */
 interface SongView {
-	fun songs(songs: ArrayList<Song>)
 
-	fun showEmptyView()
+    fun songs(songs: List<Song>)
+
+    fun showEmptyView()
 }
 
 interface SongPresenter : Presenter<SongView> {
-	fun loadSongs()
-	class SongPresenterImpl @Inject constructor(
-			private val repository: Repository
-	) : PresenterImpl<SongView>(), SongPresenter, CoroutineScope {
+    fun loadSongs()
+    class SongPresenterImpl @Inject constructor(
+        private val repository: Repository
+    ) : PresenterImpl<SongView>(), SongPresenter, CoroutineScope {
 
-		private var job: Job = Job()
+        private var job: Job = Job()
 
-		override val coroutineContext: CoroutineContext
-			get() = Dispatchers.IO + job
+        override val coroutineContext: CoroutineContext
+            get() = Dispatchers.IO + job
 
-		override fun loadSongs() {
-			launch {
-				when (val songs = repository.allSongs()) {
-					is Result.Success -> withContext(Dispatchers.Main) { view?.songs(songs.data) }
-					is Result.Error   -> withContext(Dispatchers.Main) { view?.showEmptyView() }
-				}
-			}
-		}
+        override fun loadSongs() {
+            launch {
+                when (val songs = repository.allSongs()) {
+                    is Result.Success -> withContext(Dispatchers.Main) { view?.songs(songs.data) }
+                    is Result.Error -> withContext(Dispatchers.Main) { view?.showEmptyView() }
+                }
+            }
+        }
 
-		override fun detachView() {
-			super.detachView()
-			job.cancel();
-		}
-	}
+        override fun detachView() {
+            super.detachView()
+            job.cancel();
+        }
+    }
 }
 
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt
index b59233191..69077ba24 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt
@@ -67,6 +67,33 @@ class RepositoryImpl @Inject constructor(private val context: Context) : Reposit
         }
     }
 
+    override suspend fun albumSongsById(albumId: Long): Result<List<Song>> {
+        return try {
+            val songs = AlbumLoader.getSongsForAlbum(context, albumId)
+            Success(songs)
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun artistSongsById(artistId: Long): Result<List<Song>> {
+        return try {
+            val songs = ArtistLoader.getSongsForArtist(context, artistId)
+            Success(songs)
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun artistAlbumsById(artistId: Long): Result<List<Album>> {
+        return try {
+            val albums = AlbumLoader.getAlbumsForArtist(context, artistId)
+            Success(albums)
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
     override suspend fun allArtists(): Result<ArrayList<Artist>> {
         return try {
             val artists = ArtistLoader.getAllArtists(context)
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt b/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt
index 80437c9fc..d28d05e24 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt
@@ -34,19 +34,25 @@ interface Repository {
 
     suspend fun albumById(albumId: Long): Result<Album>
 
-    suspend fun allSongs(): Result<ArrayList<Song>>
+    suspend fun albumSongsById(albumId: Long): Result<List<Song>>
 
-    suspend fun allArtists(): Result<ArrayList<Artist>>
+    suspend fun artistSongsById(artistId: Long): Result<List<Song>>
 
-    suspend fun allPlaylists(): Result<ArrayList<Playlist>>
+    suspend fun artistAlbumsById(artistId: Long): Result<List<Album>>
 
-    suspend fun allGenres(): Result<ArrayList<Genre>>
+    suspend fun allSongs(): Result<List<Song>>
+
+    suspend fun allArtists(): Result<List<Artist>>
+
+    suspend fun allPlaylists(): Result<List<Playlist>>
+
+    suspend fun allGenres(): Result<List<Genre>>
 
     suspend fun search(query: String?): Result<MutableList<Any>>
 
-    suspend fun getPlaylistSongs(playlist: Playlist): Result<ArrayList<Song>>
+    suspend fun getPlaylistSongs(playlist: Playlist): Result<List<Song>>
 
-    suspend fun getGenre(genreId: Int): Result<ArrayList<Song>>
+    suspend fun getGenre(genreId: Int): Result<List<Song>>
 
     suspend fun recentArtists(): Result<Home>