diff --git a/Controllers/Managers/AlbumManager.cs b/Controllers/Managers/AlbumManager.cs
new file mode 100644
index 0000000..197864f
--- /dev/null
+++ b/Controllers/Managers/AlbumManager.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using Configuration;
+
+using Icarus.Controllers.Utilities;
+using Icarus.Models;
+using Icarus.Models.Context;
+
+namespace Icarus.Controllers.Managers
+{
+	public class AlbumManager : BaseManager
+	{
+		#region Fields
+		#endregion
+
+
+		#region Properties
+		#endregion
+
+
+		#region Constructors
+		#endregion
+
+
+		#region Methods
+		#endregion
+	}
+}
diff --git a/Controllers/Managers/ArtistManager.cs b/Controllers/Managers/ArtistManager.cs
new file mode 100644
index 0000000..46ff341
--- /dev/null
+++ b/Controllers/Managers/ArtistManager.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using Configuration;
+
+using Icarus.Controllers.Utilities;
+using Icarus.Models;
+using Icarus.Models.Context;
+
+namespace Icarus.Controllers.Managers
+{
+	public class ArtistManager : BaseManager
+	{
+		#region Fields
+		#endregion
+
+
+		#region Properties
+		#endregion
+
+
+		#region Constructors
+		#endregion
+
+
+		#region Methods
+		#endregion
+	}
+}
diff --git a/Controllers/Managers/GenreManager.cs b/Controllers/Managers/GenreManager.cs
new file mode 100644
index 0000000..2de7974
--- /dev/null
+++ b/Controllers/Managers/GenreManager.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using Configuration;
+
+using Icarus.Controllers.Utilities;
+using Icarus.Models;
+using Icarus.Models.Context;
+
+namespace Icarus.Controllers.Managers
+{
+	public class GenreManager : BaseManager
+	{
+		#region Fields
+		#endregion
+
+
+		#region Properties
+		#endregion
+
+
+		#region Constructors
+		#endregion
+
+
+		#region Methods
+		#endregion
+	}
+}
diff --git a/Controllers/Managers/SongManager.cs b/Controllers/Managers/SongManager.cs
index 138c224..081bf5c 100644
--- a/Controllers/Managers/SongManager.cs
+++ b/Controllers/Managers/SongManager.cs
@@ -1131,7 +1131,7 @@ namespace Icarus.Controllers.Managers
 				return;
 			}
 
-			var album = albumStore.GetAlbum(song);
+			var album = albumStore.GetAlbum(song, true);
 
 			if (album.SongCount <= 1)
 			{
@@ -1146,7 +1146,7 @@ namespace Icarus.Controllers.Managers
 				return;
 			}
 
-			var artist = artistStore.GetArtist(song);
+			var artist = artistStore.GetArtist(song, true);
 
 			if (artist.SongCount <= 1)
 			{
@@ -1161,7 +1161,7 @@ namespace Icarus.Controllers.Managers
 				return;
 			}
 
-			var genre = genreStore.GetGenre(song);
+			var genre = genreStore.GetGenre(song, true);
 
 			if (genre.SongCount <= 1)
 			{
@@ -1176,7 +1176,7 @@ namespace Icarus.Controllers.Managers
 				return;
 			}
 
-			var year = yearStore.GetSongYear(song);
+			var year = yearStore.GetSongYear(song, true);
 
 			if (year.SongCount <= 1)
 			{
diff --git a/Controllers/Managers/YearManager.cs b/Controllers/Managers/YearManager.cs
new file mode 100644
index 0000000..a835132
--- /dev/null
+++ b/Controllers/Managers/YearManager.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using Configuration;
+
+using Icarus.Controllers.Utilities;
+using Icarus.Models;
+using Icarus.Models.Context;
+
+namespace Icarus.Controllers.Managers
+{
+	public class YearManager : BaseManager
+	{
+		#region Fields
+		#endregion
+
+
+		#region Properties
+		#endregion
+
+
+		#region Constructors
+		#endregion
+
+
+		#region Methods
+		#endregion
+	}
+}
diff --git a/Controllers/SongStreamController.cs b/Controllers/SongStreamController.cs
index b0f6927..a7cfc5d 100644
--- a/Controllers/SongStreamController.cs
+++ b/Controllers/SongStreamController.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Http.Headers;
+using System.Web;
 using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Authorization;
@@ -37,23 +39,19 @@ namespace Icarus.Controllers
 
 		#region HTTP endpoints
 		[HttpGet("{id}")]
-		public IActionResult Get(int id)
+		public async Task<IActionResult> Get(int id)
 		{
 			var songStore= HttpContext
 				.RequestServices
 				.GetService(typeof(MusicStoreContext)) as MusicStoreContext;
 
-			var song = songStore.GetSong(new Song
-			{
-				Id = id
-			});
-
+			var song = songStore.GetSong(new Song { Id = id });
 
 			var mem =  new MemoryStream();
 
 			using (var stream = new FileStream(song.SongPath, FileMode.Open, FileAccess.Read))
 			{
-				stream.CopyToAsync(mem);
+				await stream.CopyToAsync(mem);
 			}
 
 			mem.Position = 0;
diff --git a/Models/Context/MusicStoreContext.cs b/Models/Context/MusicStoreContext.cs
index 9acc79a..58b94ce 100644
--- a/Models/Context/MusicStoreContext.cs
+++ b/Models/Context/MusicStoreContext.cs
@@ -193,21 +193,17 @@ namespace Icarus.Models.Context
 		{
 			try
 			{
-				Console.WriteLine("dddd");
 				_logger.Info("Retrieving song from database");
 
 				using (var conn = GetConnection())
 				{
 					conn.Open();
 					var query = "SELECT * FROM Song WHERE Id=@Id";
-					Console.WriteLine("Transfer");
 
 					using (var cmd = new MySqlCommand(query, conn))
 					{
-						Console.WriteLine("Temperment");
 						cmd.Parameters.AddWithValue("@Id", song.Id);
 
-						Console.WriteLine("Lost");
 						using (var reader = cmd.ExecuteReader())
 						{
 							song = ParseSingleData(reader);
@@ -303,7 +299,6 @@ namespace Icarus.Models.Context
 		{
 			Song song = new Song();
 
-			Console.WriteLine("ddddddddddddd");
 			while (reader.Read())
 			{
 		        	song.Id = Convert.ToInt32(reader["Id"]);
@@ -321,8 +316,6 @@ namespace Icarus.Models.Context
 				song.YearId = Convert.ToInt32(reader["YearId"].ToString());
 			}
 
-			Console.WriteLine("Panic");
-
 			return song;
 		}