diff --git a/audiotrivia/audiotrivia.py b/audiotrivia/audiotrivia.py
index 394e1d1..586f5b7 100644
--- a/audiotrivia/audiotrivia.py
+++ b/audiotrivia/audiotrivia.py
@@ -5,13 +5,15 @@ from typing import List
 import lavalink
 import yaml
 from redbot.cogs.audio import Audio
+from redbot.cogs.audio.core.utilities import validation
 from redbot.cogs.trivia import LOG
 from redbot.cogs.trivia.trivia import InvalidListError, Trivia
 from redbot.core import commands, Config, checks
 from redbot.core.bot import Red
 from redbot.core.data_manager import cog_data_path
 from redbot.core.utils.chat_formatting import box
-from redbot.cogs.audio.utils import userlimit
+# from redbot.cogs.audio.utils import userlimit
+
 
 from .audiosession import AudioSession
 
@@ -106,7 +108,7 @@ class AudioTrivia(Trivia):
             try:
                 if not ctx.author.voice.channel.permissions_for(
                     ctx.me
-                ).connect or userlimit(ctx.author.voice.channel):
+                ).connect or self.audio.is_vc_full(ctx.author.voice.channel):
                     return await ctx.send("I don't have permission to connect to your channel.")
                 await lavalink.connect(ctx.author.voice.channel)
                 lavaplayer = lavalink.get_player(ctx.guild.id)
@@ -117,7 +119,7 @@ class AudioTrivia(Trivia):
         lavaplayer = lavalink.get_player(ctx.guild.id)
         lavaplayer.store("channel", ctx.channel.id)  # What's this for? I dunno
 
-        await self.audio._data_check(ctx)
+        await self.audio.set_player_settings(ctx)
 
         if not ctx.author.voice or ctx.author.voice.channel != lavaplayer.channel:
             return await ctx.send(
diff --git a/audiotrivia/data/lists/hockeygoalhorns.yaml b/audiotrivia/data/lists/hockeygoalhorns.yaml
deleted file mode 100644
index dd825e8..0000000
--- a/audiotrivia/data/lists/hockeygoalhorns.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-AUTHOR: Lazar
-https://www.youtube.com/watch?v=6OejNXrGkK0&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq:
-- Anaheim
-- Ducks
-- Anaheim Ducks
-https://www.youtube.com/watch?v=RbUxSPoU9Yg&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=2:
-- Arizona
-- Coyotes
-- Arizona Coyotes
-https://www.youtube.com/watch?v=DsI0PgWADks&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=4:
-- Boston
-- Bruins
-- Boston Bruins
-https://www.youtube.com/watch?v=hjFTd3MJOHc&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=5:
-- Buffalo
-- Sabres
-- Buffalo Sabres
-https://www.youtube.com/watch?v=sn1PliBCRDY&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=6:
-- Calgary
-- Flames
-- Calgary Flames
-https://www.youtube.com/watch?v=3exZm6Frd18&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=7:
-- Carolina
-- Hurricanes
-- Carolina Hurricanes
-https://www.youtube.com/watch?v=sBeXPMkqR80&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=8:
-- Chicago
-- Blackhawks
-- Chicago Blackhawks
-https://www.youtube.com/watch?v=MARxzs_vCPI&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=9:
-- Colorado
-- Avalanche
-- Colorado Avalanche
-https://www.youtube.com/watch?v=6yYbQfOWw4k&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=10:
-- Columbus
-- Blue Jackets
-- Columbus Blue Jackets
-https://www.youtube.com/watch?v=Af8_9NP5lyw&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=11:
-- Dallas
-- Stars
-- Dallas Stars
-https://www.youtube.com/watch?v=JflfvLvY7ks&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=13:
-- Detroit
-- Red wings
-- Detroit Red Wings
-https://www.youtube.com/watch?v=xc422k5Tcqc&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=15:
-- Edmonton
-- Oilers
-- Edmonton Oilers
-https://www.youtube.com/watch?v=Dm1bjUB9HLE&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=16:
-- Florida
-- Panthers
-- Florida Panthers
-https://www.youtube.com/watch?v=jSgd3aIepY4&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=17:
-- Los Angeles
-- Kings
-- Los Angeles Kings
-https://www.youtube.com/watch?v=4Pj8hWPR9VI&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=18:
-- Minnesota
-- Wild
-- Minnesota Wild
-https://www.youtube.com/watch?v=rRGlUFWEBMk&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=19:
-- Montreal
-- Canadiens
-- Montreal Canadiens
-https://www.youtube.com/watch?v=fHTehdlMwWQ&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=20:
-- Nashville
-- Predators
-- Nashville Predators
-https://www.youtube.com/watch?v=4q0eNg-AbrQ&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=21:
-- New Jersey
-- Devils
-- New Jersey Devils
-https://www.youtube.com/watch?v=ZC514zGrL80&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=23:
-- New York
-- Islanders
-- New York Islanders
-https://www.youtube.com/watch?v=Zzfks2A2n38&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=24:
-- New York
-- Rangers
-- New York Rangers
-https://www.youtube.com/watch?v=fHlWxPRNVBc&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=25:
-- Ottawa
-- Senators
-- Ottawa Senators
-https://www.youtube.com/watch?v=0LsXpMiVD1E&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=26:
-- Philadelphia
-- Flyers
-- Philadelphia Flyers
-https://www.youtube.com/watch?v=Llw3adcNuzI&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=27:
-- Pittsburgh
-- Penguins
-- Pittsburgh Penguins
-https://www.youtube.com/watch?v=NZqSBkmpbLw&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=28:
-- San Jose
-- Sharks
-- San Jose Sharks
-https://www.youtube.com/watch?v=Q23TDOJsY1s&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=29:
-- St. Louis
-- Blues
-- St. Louis Blues
-https://www.youtube.com/watch?v=bdhDXxM20iM&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=30:
-- Tampa Bay
-- Lightning
-- Tampa Bay Lightning
-https://www.youtube.com/watch?v=2cyekaemZgs&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=31:
-- Toronto
-- Maple Leafs
-- Toronto Maple Leafs
-https://www.youtube.com/watch?v=CPozN-ZHpAo&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=32:
-- Vancouver
-- Canucks
-- Vancouver Canucks
-https://www.youtube.com/watch?v=zheGI316WXg&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=33:
-- Vegas
-- Golden Knights
-- Vegas Golden Knights
-https://www.youtube.com/watch?v=BH_CC1RxtfU&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=34:
-- Washington
-- Capitals
-- Washington Capitals
-https://www.youtube.com/watch?v=3gcahU_i9WE&list=PLEfKMmYWy5LTPwexaHOaPeYBne8j7udRq&index=35:
-- Winnipeg
-- Jets
-- Winnipeg Jets
diff --git a/audiotrivia/data/lists/nhlgoalhorns.yaml b/audiotrivia/data/lists/nhlgoalhorns.yaml
new file mode 100644
index 0000000..4dd28ac
--- /dev/null
+++ b/audiotrivia/data/lists/nhlgoalhorns.yaml
@@ -0,0 +1,125 @@
+AUTHOR: Lazar
+https://youtu.be/6OejNXrGkK0:
+- Anaheim
+- Ducks
+- Anaheim Ducks
+https://youtu.be/RbUxSPoU9Yg:
+- Arizona
+- Coyotes
+- Arizona Coyotes
+https://youtu.be/DsI0PgWADks:
+- Boston
+- Bruins
+- Boston Bruins
+https://youtu.be/hjFTd3MJOHc:
+- Buffalo
+- Sabres
+- Buffalo Sabres
+https://youtu.be/sn1PliBCRDY:
+- Calgary
+- Flames
+- Calgary Flames
+https://youtu.be/3exZm6Frd18:
+- Carolina
+- Hurricanes
+- Carolina Hurricanes
+https://youtu.be/sBeXPMkqR80:
+- Chicago
+- Blackhawks
+- Chicago Blackhawks
+https://youtu.be/MARxzs_vCPI:
+- Colorado
+- Avalanche
+- Colorado Avalanche
+https://youtu.be/6yYbQfOWw4k:
+- Columbus
+- Blue Jackets
+- Columbus Blue Jackets
+https://youtu.be/Af8_9NP5lyw:
+- Dallas
+- Stars
+- Dallas Stars
+https://youtu.be/JflfvLvY7ks:
+- Detroit
+- Red wings
+- Detroit Red Wings
+https://youtu.be/xc422k5Tcqc:
+- Edmonton
+- Oilers
+- Edmonton Oilers
+https://youtu.be/Dm1bjUB9HLE:
+- Florida
+- Panthers
+- Florida Panthers
+https://youtu.be/jSgd3aIepY4:
+- Los Angeles
+- Kings
+- Los Angeles Kings
+https://youtu.be/4Pj8hWPR9VI:
+- Minnesota
+- Wild
+- Minnesota Wild
+https://youtu.be/rRGlUFWEBMk:
+- Montreal
+- Canadiens
+- Montreal Canadiens
+https://youtu.be/fHTehdlMwWQ:
+- Nashville
+- Predators
+- Nashville Predators
+https://youtu.be/4q0eNg-AbrQ:
+- New Jersey
+- Devils
+- New Jersey Devils
+https://youtu.be/ZC514zGrL80:
+- New York
+- Islanders
+- New York Islanders
+https://youtu.be/Zzfks2A2n38:
+- New York
+- Rangers
+- New York Rangers
+https://youtu.be/fHlWxPRNVBc:
+- Ottawa
+- Senators
+- Ottawa Senators
+https://youtu.be/0LsXpMiVD1E:
+- Philadelphia
+- Flyers
+- Philadelphia Flyers
+https://youtu.be/Llw3adcNuzI:
+- Pittsburgh
+- Penguins
+- Pittsburgh Penguins
+https://youtu.be/NZqSBkmpbLw:
+- San Jose
+- Sharks
+- San Jose Sharks
+https://youtu.be/Q23TDOJsY1s:
+- St. Louis
+- Blues
+- St. Louis Blues
+https://youtu.be/bdhDXxM20iM:
+- Tampa Bay
+- Lightning
+- Tampa Bay Lightning
+https://youtu.be/2cyekaemZgs:
+- Toronto
+- Maple Leafs
+- Toronto Maple Leafs
+https://youtu.be/CPozN-ZHpAo:
+- Vancouver
+- Canucks
+- Vancouver Canucks
+https://youtu.be/zheGI316WXg:
+- Vegas
+- Golden Knights
+- Vegas Golden Knights
+https://youtu.be/BH_CC1RxtfU:
+- Washington
+- Capitals
+- Washington Capitals
+https://youtu.be/3gcahU_i9WE:
+- Winnipeg
+- Jets
+- Winnipeg Jets