diff --git a/src/main/java/moe/nekojimi/chords/QueueManager.java b/src/main/java/moe/nekojimi/chords/QueueManager.java
index 77b80cd..d67d5d5 100644
--- a/src/main/java/moe/nekojimi/chords/QueueManager.java
+++ b/src/main/java/moe/nekojimi/chords/QueueManager.java
@@ -16,7 +16,9 @@
  */
 package moe.nekojimi.chords;
 
+import java.util.Comparator;
 import java.util.LinkedList;
+import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.function.Consumer;
 
@@ -28,13 +30,13 @@ public class QueueManager implements Consumer<Song>
 {
 
     private Song restartingSong = null;
-    private final Queue<Song> jukeboxQueue;
+    private final PriorityQueue<Song> jukeboxQueue = new PriorityQueue<>();
     private Playlist playlist;
     private MusicHandler handler;
 
     public QueueManager()
     {
-        jukeboxQueue = new LinkedList<>();
+//        jukeboxQueue = new LinkedList<>();
     }
 
     @Override