diff --git a/Mear/Mear/ViewModels/AlbumViewModel.cs b/Mear/Mear/ViewModels/AlbumViewModel.cs
index 61ea989..470f128 100644
--- a/Mear/Mear/ViewModels/AlbumViewModel.cs
+++ b/Mear/Mear/ViewModels/AlbumViewModel.cs
@@ -18,6 +18,7 @@ namespace Mear.ViewModels
 		private ObservableCollection<Album> _albumItems;
 		private Command _refreshAlbums;
         private Command _searchAlbumCommand;
+        private List<Album> _albums;
 		#endregion
 
 
@@ -52,19 +53,31 @@ namespace Mear.ViewModels
 
 
 		#region Methods
+        public async void SearchAlbums(string text)
+        {
+            if (string.IsNullOrEmpty(text))
+            {
+                _albumItems.Clear();
+                _albums.ToList().ForEach(_albumItems.Add);
+            }
+            else
+            {
+                var albumItems = _albums.Where(a => a.Title.Contains(text)).ToList();
+                _albumItems.Clear();
+                albumItems.ToList().ForEach(_albumItems.Add);
+            }
+        }
+
 		private async Task PopulateAlbumsAsync()
 		{
 			try
 			{
 				var albumRepo = new RemoteAlbumRepository();
-				var albums = albumRepo.RetrieveAlbums().OrderBy(a => a.Title).ToList();
+				_albums = albumRepo.RetrieveAlbums().OrderBy(a => a.Title).ToList();
 
 				_albumItems.Clear();
 
-				foreach (var album in albums)
-				{
-					_albumItems.Add(album);
-				}
+                _albums.ToList().ForEach(_albumItems.Add);
 			}
 			catch (Exception ex)
 			{
diff --git a/Mear/Mear/ViewModels/ArtistViewModel.cs b/Mear/Mear/ViewModels/ArtistViewModel.cs
index df8be7a..7db2803 100644
--- a/Mear/Mear/ViewModels/ArtistViewModel.cs
+++ b/Mear/Mear/ViewModels/ArtistViewModel.cs
@@ -18,6 +18,7 @@ namespace Mear.ViewModels
 		private ObservableCollection<Artist> _artistItems;
 		private Command _refreshArtists;
         private Command _searchArtistCommand;
+        private List<Artist> _artists;
 		#endregion
 
 
@@ -52,19 +53,30 @@ namespace Mear.ViewModels
 
 
 		#region Methods
+        public async void SearchArtists(string text)
+        {
+            if (string.IsNullOrEmpty(text))
+            {
+                _artistItems.Clear();
+                _artists.ToList().ForEach(_artistItems.Add);
+            }
+            else
+            {
+                var artistItems = _artists.Where(a => a.Name.Contains(text)).ToList();
+                _artistItems.Clear();
+                artistItems.ToList().ForEach(_artistItems.Add);
+            }
+        }
 		private async Task PopulateArtistsAsync()
 		{
 			try
 			{
 				var artistRepo = new RemoteArtistRepository();
-				var artists = artistRepo.RetrieveArtists().OrderBy(a => a.Name).ToList();
+				_artists = artistRepo.RetrieveArtists().OrderBy(a => a.Name).ToList();
 
 				_artistItems.Clear();
 
-				foreach (var artist in artists)
-				{
-					_artistItems.Add(artist);
-				}
+                _artists.ToList().ForEach(_artistItems.Add);
 			}
 			catch (Exception ex)
 			{
diff --git a/Mear/Mear/ViewModels/SongViewModel.cs b/Mear/Mear/ViewModels/SongViewModel.cs
index 7d8cf68..4e8ce56 100644
--- a/Mear/Mear/ViewModels/SongViewModel.cs
+++ b/Mear/Mear/ViewModels/SongViewModel.cs
@@ -19,6 +19,7 @@ namespace Mear.ViewModels
         private ObservableCollection<Song> _songItems;
         private Command _refreshSongs;
         private Command _searchSongsCommand;
+        private List<Song> _songs;
         #endregion
 
 
@@ -50,7 +51,7 @@ namespace Mear.ViewModels
             _refreshSongs = new Command(async () => await PopulateSongsAsync());
             _searchSongsCommand = new Command(async () => await SearchSongText());
 
-            PopulateSongs();
+            PopulateSongsAsync();
         }
         #endregion
 
@@ -73,9 +74,22 @@ namespace Mear.ViewModels
                 songs = rmtSongs;
             }
 
-            foreach (var song in songs)
+            songs.ToList().ForEach(_songItems.Add);
+        }
+
+        public async void FilterSongs(string text)
+        {
+            if (string.IsNullOrEmpty(text))
             {
-                _songItems.Add(song);
+                _songItems.Clear();
+                _songs.ToList().ForEach(_songItems.Add);
+            }
+            else
+            {
+                var songItems = _songs.Where(s => s.Title.Contains(text) || 
+                    s.Artist.Contains(text)).ToList();
+                _songItems.Clear();
+                songItems.ToList().ForEach(_songItems.Add);
             }
         }
 
@@ -107,23 +121,19 @@ namespace Mear.ViewModels
                 var localSongRepo = new LocalSongRepository();
                 var lclSongs = localSongRepo.RetrieveSongs();
                 var rmtSongs = songRepo.RetrieveSongs().OrderBy(s => s.Title).ToList();
-                var songs = new List<Song>();
                 if (lclSongs != null)
                 {
                     lclSongs = lclSongs.OrderBy(s => s.Title).ToList();
-                    songs = MergeSongs(lclSongs, rmtSongs);
+                    _songs = MergeSongs(lclSongs, rmtSongs);
                 }
                 else
                 {
-                    songs = rmtSongs;
+                    _songs = rmtSongs;
                 }
 
                 _songItems.Clear();
 
-                foreach (var song in songs)
-                {
-                    _songItems.Add(song);
-                }
+                _songs.ToList().ForEach(_songItems.Add);
             }
             catch (Exception ex)
             {
diff --git a/Mear/Mear/Views/AlbumView.xaml b/Mear/Mear/Views/AlbumView.xaml
index 6cad220..cbb7413 100644
--- a/Mear/Mear/Views/AlbumView.xaml
+++ b/Mear/Mear/Views/AlbumView.xaml
@@ -16,7 +16,8 @@
                    Placeholder="Album"
                    SearchCommand="{Binding SearchAlbumCommand}"
                    SearchCommandParameter="{Binding SearchedText, Source=x:Reference Search}"
-                   Text="{Binding SearchedText, Mode=TwoWay}" />
+                   Text="{Binding SearchedText, Mode=TwoWay}"
+                   TextChanged="SearchAlbum_TextChanged" />
         <ListView x:Name="AlbumListView"
 			  ItemsSource="{Binding AlbumItems}"
 			  VerticalOptions="FillAndExpand"
diff --git a/Mear/Mear/Views/AlbumView.xaml.cs b/Mear/Mear/Views/AlbumView.xaml.cs
index 72d62bd..40e9b26 100644
--- a/Mear/Mear/Views/AlbumView.xaml.cs
+++ b/Mear/Mear/Views/AlbumView.xaml.cs
@@ -39,7 +39,13 @@ namespace Mear.Views
 		{
             var albumItem = (sender as ListView).SelectedItem = null;
 		}
-		#endregion
-		#endregion
-	}
+
+        private async void SearchAlbum_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var text = e.NewTextValue;
+            _viewModel.SearchAlbums(text);
+        }
+        #endregion
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/Mear/Mear/Views/ArtistView.xaml b/Mear/Mear/Views/ArtistView.xaml
index e8a4a44..9b6959c 100644
--- a/Mear/Mear/Views/ArtistView.xaml
+++ b/Mear/Mear/Views/ArtistView.xaml
@@ -17,7 +17,8 @@
                   Placeholder="Artist"
                   SearchCommand="{Binding SearchArtistCommand}"
                   SearchCommandParameter="{Binding SearchedText, Source=x:Reference Search}"
-                  Text="{Binding SearchedText, Mode=TwoWay}" />
+                  Text="{Binding SearchedText, Mode=TwoWay}"
+                  TextChanged="SearchArtist_TextChanged" />
         <ListView x:Name="ArtistListView"
 				  ItemsSource="{Binding ArtistItems}"
 				  VerticalOptions="FillAndExpand"
diff --git a/Mear/Mear/Views/ArtistView.xaml.cs b/Mear/Mear/Views/ArtistView.xaml.cs
index b413e1e..a102f42 100644
--- a/Mear/Mear/Views/ArtistView.xaml.cs
+++ b/Mear/Mear/Views/ArtistView.xaml.cs
@@ -39,7 +39,13 @@ namespace Mear.Views
 		{
             var artistItem = (sender as ListView).SelectedItem = null;
 		}
-		#endregion
-		#endregion
-	}
+
+        private async void SearchArtist_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var text = e.NewTextValue.ToString();
+            _viewModel.SearchArtists(text);
+        }
+        #endregion
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/Mear/Mear/Views/MearPlayerView.xaml.cs b/Mear/Mear/Views/MearPlayerView.xaml.cs
index 5821a0f..51a8071 100644
--- a/Mear/Mear/Views/MearPlayerView.xaml.cs
+++ b/Mear/Mear/Views/MearPlayerView.xaml.cs
@@ -225,11 +225,11 @@ namespace Mear.Views
             await MearPlayer.SeekTo(progVal);
 		}
 
-		private void Download_Clicked(object sender, EventArgs e)
+		private async void Download_Clicked(object sender, EventArgs e)
 		{
-            RemoveSyncToolbar();
-            MearPlayer.DownloadSongToFS();
+            await MearPlayer.DownloadSongToFS();
 
+            RemoveSyncToolbar();
             ToolbarItems.Add(RemoveOption());
 
             _song.Downloaded = true;
@@ -237,11 +237,10 @@ namespace Mear.Views
         private async void Remove_Clicked(object sender, EventArgs e)
         {
             RemoveSyncToolbar();
-            MearPlayer.RemoveSongFromFS();
+            await MearPlayer.RemoveSongFromFS();
 
             _song.Downloaded = false;
 
-
             ToolbarItems.Add(DownloadOption());
         }
         private async void PlayCount_Clicked(object sender, EventArgs e)
diff --git a/Mear/Mear/Views/SongView.xaml b/Mear/Mear/Views/SongView.xaml
index 2d7a807..a23e082 100644
--- a/Mear/Mear/Views/SongView.xaml
+++ b/Mear/Mear/Views/SongView.xaml
@@ -17,7 +17,8 @@
                  Placeholder="Title, Artist"
                  SearchCommand="{Binding SearchSongsCommand}"
                  SearchCommandParameter="{Binding SearchedText, Source=x:Reference Search}"
-                 Text="{Binding SerachedText, Mode=TwoWay}">
+                 Text="{Binding SerachedText, Mode=TwoWay}"
+                 TextChanged="SearchSong_TextChanged" >
         </SearchBar>
         <ListView x:Name="SongListView"
 				ItemsSource="{Binding SongItems}"
diff --git a/Mear/Mear/Views/SongView.xaml.cs b/Mear/Mear/Views/SongView.xaml.cs
index 9634105..e96e2ed 100644
--- a/Mear/Mear/Views/SongView.xaml.cs
+++ b/Mear/Mear/Views/SongView.xaml.cs
@@ -43,7 +43,6 @@ namespace Mear.Views
 		#region Events
 		private async void SongListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)
 		{
-			var i = "here";
 			if (SongListView.SelectedItem == null)
 			{
 				SongListView.SelectedItem = null;
@@ -72,6 +71,12 @@ namespace Mear.Views
 			SongListView.SelectedItem = null;
 		}
 
+        private void SearchSong_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var text = e.NewTextValue.ToString();
+            _viewModel.FilterSongs(text);
+        }
+
 		private async void SongOptions_Clicked(object sender, EventArgs e)
 		{
 			try
@@ -91,7 +96,7 @@ namespace Mear.Views
 			var songRepo = new RemoteSongRepository();
 			var songs = songRepo.RetrieveSongs();
 		}
-		#endregion
-		#endregion
-	}
+        #endregion
+        #endregion
+    }
 }
\ No newline at end of file