diff --git a/src/commands/music/CommandMusicMain.java b/src/commands/music/CommandMusicMain.java
index 6581271..7e71fc6 100644
--- a/src/commands/music/CommandMusicMain.java
+++ b/src/commands/music/CommandMusicMain.java
@@ -27,7 +27,6 @@ public class CommandMusicMain extends Command
 	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
 	{
 		SubCommandFormattable scf = framework.run(guild, channel, user, input);
-		System.out.println("SCF: " + scf.resString);
 		scf.Call(res);
 	}
 }
\ No newline at end of file
diff --git a/src/commands/music/MusicThread.java b/src/commands/music/MusicThread.java
deleted file mode 100644
index dd99216..0000000
--- a/src/commands/music/MusicThread.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package commands.music;
-
-public class MusicThread extends Thread 
-{
-	public MusicThread()
-	{
-		
-	}
-	
-	//Called when spawned 
-	@Override
-	public void run()
-	{
-		
-	}
-	
-	
-}
diff --git a/src/commands/music/SubCommandPlaylist.java b/src/commands/music/SubCommandPlaylist.java
index f0ef41b..b6c2a3f 100644
--- a/src/commands/music/SubCommandPlaylist.java
+++ b/src/commands/music/SubCommandPlaylist.java
@@ -1,5 +1,9 @@
 package commands.music;
 
+import java.util.ArrayList;
+
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
+
 import core.SubCommand;
 import core.SubCommandFormattable;
 import dataStructures.KittyChannel;
@@ -17,9 +21,18 @@ public class SubCommandPlaylist extends SubCommand
 	@Override
 	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
 	{
-//		ArrayList<AudioTrack> playlist = guild.audio.getPlaylist();
-		String stringPlaylist = guild.audio.getPlaylist(guild.audio.player);
+		ArrayList <AudioTrack> playlist = guild.audio.getPlaylist();
+		String stringPlaylist = "";
+		
+		for(AudioTrack track : playlist)
+		{
+			stringPlaylist += (playlist.indexOf(track) + 1) + ": " + track.getInfo().title + "\n"; 
+		}
+		if(stringPlaylist.equals(""))
+		{
+			return new SubCommandFormattable("Nothing Queued!");
+		}
 		return new SubCommandFormattable(stringPlaylist);
 	}
 
-}
+}
\ No newline at end of file
diff --git a/src/commands/music/SubCommandStop.java b/src/commands/music/SubCommandStop.java
index 2aacffd..1422792 100644
--- a/src/commands/music/SubCommandStop.java
+++ b/src/commands/music/SubCommandStop.java
@@ -17,8 +17,7 @@ public class SubCommandStop extends SubCommand
 	@Override
 	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
 	{
-		
 		return new SubCommandFormattable(guild.audio.stopPlayer(guild.audio.player));
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/src/utils/audio/AudioUtils.java b/src/utils/audio/AudioUtils.java
index ab209b2..7430926 100644
--- a/src/utils/audio/AudioUtils.java
+++ b/src/utils/audio/AudioUtils.java
@@ -1,6 +1,5 @@
 package utils.audio;
-import java.util.LinkedList;
-import java.util.Queue;
+import java.util.ArrayList;
 
 import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
@@ -21,7 +20,7 @@ public class AudioUtils
 	public AudioManager am;
 	public final AudioPlayer player;
 	public final AudioPlayerManager playerManager;
-	private Queue <AudioTrack> playlist = new LinkedList<>();
+	private ArrayList <AudioTrack> playlist = new ArrayList<AudioTrack>();
 	
 	
 	public AudioUtils(Guild guild, AudioPlayerManager playerManager)
@@ -85,12 +84,9 @@ public class AudioUtils
 	}
 	
 	public class SmallAudio implements AudioLoadResultHandler
-	{
-		private AudioPlayer player;
-		
+	{	
 		private SmallAudio(AudioPlayer player)
 		{
-			this.player = player;
 		}
 		
 		@Override public void loadFailed(FriendlyException arg0) { }
@@ -104,14 +100,6 @@ public class AudioUtils
 			{
 				playlist.add(track);
 			}
-			do 
-			{
-				if(player.getPlayingTrack() == null)
-				{
-					player.startTrack(playlist.poll(), false);
-				}
-			}
-			while(!playlist.isEmpty());
 		}
 	}
 	
@@ -120,13 +108,21 @@ public class AudioUtils
 	{
 		guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(player));
 		playerManager.loadItemOrdered(player, videoURL, new SmallAudio(player));
-		
+		try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {}
+		if(player.getPlayingTrack() == null)
+		{
+			MusicController control = new MusicController(player, playlist);
+			control.start();
+		}
 		return null;
 	}
 	
 	public String skipVideo(AudioPlayer player)
 	{
-		return null;
+		player.stopTrack();
+		return "Skipped";
 	}
 	
 	public String stopPlayer(AudioPlayer player)
@@ -136,13 +132,44 @@ public class AudioUtils
 		return "Stopped";
 	}
 	
-	public String getPlaylist(AudioPlayer player)
+	public ArrayList<AudioTrack> getPlaylist()
 	{
-		String response ="";
-		for(AudioTrack track:playlist)
+		return playlist;
+	}
+}
+
+class MusicController extends Thread
+{
+	AudioPlayer player;
+	private ArrayList <AudioTrack> playlist;
+	
+	public MusicController(AudioPlayer player, ArrayList <AudioTrack> playlist)
+	{
+		this.player = player;
+		this.playlist = playlist; 
+	}
+	
+	@Override
+	public void run()
+	{
+		AudioTrack nowPlaying = null;
+		do 
 		{
-			response += track.getInfo().title;
+			if(!playlist.isEmpty() || nowPlaying != null)
+			{
+				if(player.getPlayingTrack() == null)
+				{
+					if(playlist.isEmpty())
+						nowPlaying = null;
+					else
+					{
+						nowPlaying = playlist.get(0);
+						playlist.remove(0);
+					}
+					player.startTrack(nowPlaying, false);
+				}
+			}
 		}
-		return response;
+		while(!playlist.isEmpty() || player.getPlayingTrack() != null);
 	}
 }