Added local audio file playback

src/main/java/com/fpghoti/biscuit/commands/CommandManager.java

@@ -4,11 +4,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
 import com.fpghoti.biscuit.commands.base.ConsoleCommand;
 import com.fpghoti.biscuit.commands.base.CustomCommand;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 import com.fpghoti.biscuit.util.Util;
@@ -20,7 +20,7 @@ public class CommandManager {
 	private static List<BaseCommand> commands = new ArrayList<BaseCommand>();
 
 	public static void parse(String message, MessageReceivedEvent event){
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		ArrayList<String> split = new ArrayList<String>();
 		String fixed = message.replaceFirst(b.getProperties().getCommandSignifier(), "");
 		String[] splitMsg = fixed.split(" ");
@@ -40,10 +40,10 @@ public class CommandManager {
 	}
 
 	public static boolean dispatch(MessageReceivedEvent event, String label, String[] args) {
-		Biscuit b = Main.getMainBiscuit();
+		BiscuitGuild b = Main.getMainBiscuit();
 		boolean isMain = true;
 		if(event != null) {
-			b = Biscuit.getBiscuit(event.getGuild());
+			b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 			isMain = false;
 			if(Util.contains(b.getProperties().disabledCommands(), label)) {
 				return false;

src/main/java/com/fpghoti/biscuit/commands/base/CustomCommand.java

@@ -1,9 +1,9 @@
 package com.fpghoti.biscuit.commands.base;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.BaseCommand;
 import com.fpghoti.biscuit.commands.CommandType;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
@@ -15,9 +15,9 @@ public class CustomCommand extends BaseCommand {
 	}
 
 	private String name;
-	private Biscuit biscuit;
+	private BiscuitGuild biscuit;
 
-	public CustomCommand(String name, Biscuit biscuit) {
+	public CustomCommand(String name, BiscuitGuild biscuit) {
 		this.name = name;
 		this.biscuit = biscuit;
 	}

src/main/java/com/fpghoti/biscuit/commands/console/GuildSayCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.console;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ConsoleCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 
 import net.dv8tion.jda.api.entities.Guild;
@@ -24,7 +24,7 @@ public class GuildSayCommand extends ConsoleCommand{
 	public void execute(String[] args) {
 		if(args.length > 0) {
 			String guildcode = args[0];
-			Biscuit b = Biscuit.getBiscuit(guildcode);
+			BiscuitGuild b = BiscuitGuild.getBiscuitGuild(guildcode);
 			if(b == null) {
 				Main.getMainBiscuit().log("INVALID GUILD! TRY: guildsay <guild-code> <channel-name> <message>");
 				return;

src/main/java/com/fpghoti/biscuit/commands/console/SayCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.console;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ConsoleCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 
 import net.dv8tion.jda.api.entities.Guild;
@@ -24,7 +24,7 @@ public class SayCommand extends ConsoleCommand{
 	}
 
 	public void execute(String[] args) {
-		Biscuit b = Main.getMainBiscuit();
+		BiscuitGuild b = Main.getMainBiscuit();
 		if(args.length > 0) {
 			String target = args[0];
 			String message = "";

src/main/java/com/fpghoti/biscuit/commands/discord/AddCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.Util;
 
@@ -22,7 +22,7 @@ public class AddCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -add");
 		if(args[0] != null && Util.isDeciDigit(args[0]) && args[1] != null && Util.isDeciDigit(args[1])) {
 			double num = Double.parseDouble(args[0]);

src/main/java/com/fpghoti/biscuit/commands/discord/ChanIDCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
@@ -20,7 +20,7 @@ public class ChanIDCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -chanid");
 		String id = event.getChannel().getId();
 		MessageText.send(event.getChannel().asTextChannel(), id);

src/main/java/com/fpghoti/biscuit/commands/discord/DivideCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.Util;
 
@@ -22,7 +22,7 @@ public class DivideCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -divide");
 		if(args[0] != null && Util.isDeciDigit(args[0]) && args[1] != null && Util.isDeciDigit(args[1])) {
 			double num = Double.parseDouble(args[0]);

src/main/java/com/fpghoti/biscuit/commands/discord/GetConfigCommand.java

@@ -3,8 +3,8 @@ package com.fpghoti.biscuit.commands.discord;
 import java.io.File;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.logging.BColor;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
@@ -25,7 +25,7 @@ public class GetConfigCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -getconfig");
 		if(PermUtil.isAdmin(event.getMember())) {
 			File config = b.getConfig().getFile();

src/main/java/com/fpghoti/biscuit/commands/discord/GuildIDCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -22,7 +22,7 @@ public class GuildIDCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -guildid");
 		if(PermUtil.isMod(event.getMember())) {
 			MessageText.send(event.getChannel().asTextChannel(), event.getGuild().getId());

src/main/java/com/fpghoti/biscuit/commands/discord/HelpCommand.java

@@ -4,12 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.BaseCommand;
 import com.fpghoti.biscuit.commands.CommandManager;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
 import com.fpghoti.biscuit.commands.base.CustomCommand;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.Util;
 
@@ -29,7 +29,7 @@ public class HelpCommand extends ClientCommand {
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
 
-		Biscuit biscuit = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild biscuit = BiscuitGuild.getBiscuitGuild(event.getGuild());
 
 		int pg = 1;
 		if (args.length > 0) {

src/main/java/com/fpghoti/biscuit/commands/discord/MakeInviteCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 import com.fpghoti.biscuit.util.Util;
@@ -30,7 +30,7 @@ public class MakeInviteCommand extends ClientCommand{
 			doubAge = Double.parseDouble(args[1]) * 3600;
 		}
 		int maxAge = (int)Math.round(doubAge);
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -makeinvite " + args[0]);
 		if((PermUtil.isAdmin(event.getMember()))) {
 			Guild g = event.getGuild();

src/main/java/com/fpghoti/biscuit/commands/discord/MultiplyCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.Util;
 
@@ -22,7 +22,7 @@ public class MultiplyCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -multiply");
 		if(args[0] != null && Util.isDeciDigit(args[0]) && args[1] != null && Util.isDeciDigit(args[1])) {
 			double num = Double.parseDouble(args[0]);

src/main/java/com/fpghoti/biscuit/commands/discord/NotSpammerCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -23,7 +23,7 @@ public class NotSpammerCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -notspammer " + args[0]);
 		for(Member m : event.getMessage().getMentions().getMembers()){
 			User u = m.getUser();

src/main/java/com/fpghoti/biscuit/commands/discord/PingCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
@@ -20,7 +20,7 @@ public class PingCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -ping");
 		MessageText.send(event.getChannel().asTextChannel(), "Pong!");	
 	}

src/main/java/com/fpghoti/biscuit/commands/discord/PowerCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.Util;
 
@@ -22,7 +22,7 @@ public class PowerCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -power");
 		if(args[0] != null && Util.isDeciDigit(args[0]) && args[1] != null && Util.isDeciDigit(args[1])) {
 			double num = Double.parseDouble(args[0]);

src/main/java/com/fpghoti/biscuit/commands/discord/RecentSpammersCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
@@ -20,7 +20,7 @@ public class RecentSpammersCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -recentspammers");
 		String msg = b.getMessageStore().getSpammerList();
 		MessageText.send(event.getChannel().asTextChannel(), msg);

src/main/java/com/fpghoti/biscuit/commands/discord/SaveConfigCommand.java

@@ -3,8 +3,8 @@ package com.fpghoti.biscuit.commands.discord;
 import java.util.List;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.logging.BColor;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
@@ -25,7 +25,7 @@ public class SaveConfigCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -saveconfig");
 		List<Attachment> attch = event.getMessage().getAttachments();
 		if(PermUtil.isAdmin(event.getMember())) {
@@ -34,7 +34,7 @@ public class SaveConfigCommand extends ClientCommand{
 					for(Attachment a : attch) {
 						b.getConfig().replaceConfig(a, event.getChannel().asTextChannel());
 						b.remove();
-						b = Biscuit.loadGuild(event.getGuild());
+						b = BiscuitGuild.loadGuild(event.getGuild());
 					}
 				}else {
 					MessageText.sendTimed(event.getChannel().asTextChannel(), event.getAuthor().getAsMention() + " Too many attachments added! "

src/main/java/com/fpghoti/biscuit/commands/discord/SoftMuteCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -23,7 +23,7 @@ public class SoftMuteCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -softmute " + args[0]);
 		for(Member m : event.getMessage().getMentions().getMembers()){
 			User u = m.getUser();

src/main/java/com/fpghoti/biscuit/commands/discord/SquareRootCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.Util;
 
@@ -22,7 +22,7 @@ public class SquareRootCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -squareroot");
 		if(args[0] != null && Util.isDeciDigit(args[0])) {
 			double num = Double.parseDouble(args[0]);

src/main/java/com/fpghoti/biscuit/commands/discord/SubtractCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.Util;
 
@@ -22,7 +22,7 @@ public class SubtractCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -subtract");
 		if(args[0] != null && Util.isDeciDigit(args[0]) && args[1] != null && Util.isDeciDigit(args[1])) {
 			double num = Double.parseDouble(args[0]);

src/main/java/com/fpghoti/biscuit/commands/discord/ToggleRoleCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -25,7 +25,7 @@ public class ToggleRoleCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		if(!event.getAuthor().isBot()) {
 			b.log(event.getAuthor().getName() + " issued a command: -togglerole " + args[0]);
 			boolean foundEmote = false;

src/main/java/com/fpghoti/biscuit/commands/discord/UIDCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -23,7 +23,7 @@ public class UIDCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -uid " + args[0]);
 		for(Member m : event.getMessage().getMentions().getMembers()){
 			User u = m.getUser();

src/main/java/com/fpghoti/biscuit/commands/discord/UnSoftMuteCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -23,7 +23,7 @@ public class UnSoftMuteCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -unsoftmute " + args[0]);
 		for(Member m : event.getMessage().getMentions().getMembers()){
 			User u = m.getUser();

src/main/java/com/fpghoti/biscuit/commands/discord/WikiCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.ClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -21,7 +21,7 @@ public class WikiCommand extends ClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -wiki");
 		if(PermUtil.isMod(event.getMember())) {
 			MessageText.send(event.getChannel().asTextChannel(), "https://git.fpghoti.com/thmsdy/Biscuit/wiki");

src/main/java/com/fpghoti/biscuit/commands/discord/music/ClearCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -21,7 +21,7 @@ public class ClearCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -clear");
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			MessageText.send(event.getChannel().asTextChannel(), "Cleared all upcoming songs from the queue.");

src/main/java/com/fpghoti/biscuit/commands/discord/music/ClearUserSongsCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -23,7 +23,7 @@ public class ClearUserSongsCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -clearusersongs " + args[0]);
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			for(Member m : event.getMessage().getMentions().getMembers()) {

src/main/java/com/fpghoti/biscuit/commands/discord/music/ForceSkipCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -21,7 +21,7 @@ public class ForceSkipCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -forceskip");
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			MessageText.send(event.getChannel().asTextChannel(), "Force skipping current song.");

src/main/java/com/fpghoti/biscuit/commands/discord/music/ForceSkipToCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 import com.fpghoti.biscuit.util.Util;
@@ -23,7 +23,7 @@ public class ForceSkipToCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -forceskipto " + args[0]);
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			if(Util.isDigit(args[0])) {

src/main/java/com/fpghoti/biscuit/commands/discord/music/LoopMusicCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -21,7 +21,7 @@ public class LoopMusicCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -loopmusic");
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			if(!b.getAudioScheduler().isLooping()) {

src/main/java/com/fpghoti/biscuit/commands/discord/music/MoveToCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 import com.fpghoti.biscuit.util.Util;
@@ -22,7 +22,7 @@ public class MoveToCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -moveto " + args[0] + " " + args[1]);
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			if(Util.isDigit(args[0]) && Util.isDigit(args[1])) {

src/main/java/com/fpghoti/biscuit/commands/discord/music/NowPlayingCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 
 import net.dv8tion.jda.api.entities.MessageEmbed;
@@ -21,7 +21,7 @@ public class NowPlayingCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -nowplaying");
 		if(b.getAudioScheduler().getQueue().getLastTrack() != null ) {
 			MessageEmbed next = b.getAudioScheduler().getQueue().getLastTrack().getEmbedMessage("Now Playing:", true);

src/main/java/com/fpghoti/biscuit/commands/discord/music/PauseCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -21,7 +21,7 @@ public class PauseCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -pause");
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			if(!b.getAudioPlayer().isPaused()) {

src/main/java/com/fpghoti/biscuit/commands/discord/music/PlayCommand.java

@@ -1,19 +1,29 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
+import java.io.File;
+
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.audio.PlayCommandUtil;
+import com.fpghoti.biscuit.audio.AudioHandler;
 import com.fpghoti.biscuit.audio.request.PlayRequest;
 import com.fpghoti.biscuit.audio.request.RequestType;
+import com.fpghoti.biscuit.audio.request.file.FileRequest;
 import com.fpghoti.biscuit.audio.request.soundcloud.SCRequest;
 import com.fpghoti.biscuit.audio.request.youtube.YTRequest;
+import com.fpghoti.biscuit.audio.result.FileResultHandler;
 import com.fpghoti.biscuit.audio.result.ResultHandler;
 import com.fpghoti.biscuit.audio.result.SCResultHandler;
 import com.fpghoti.biscuit.audio.result.YTResultHandler;
-import com.fpghoti.biscuit.biscuit.Biscuit;
+import com.fpghoti.biscuit.audio.util.AudioUtil;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
+import com.fpghoti.biscuit.rest.MessageText;
+import com.fpghoti.biscuit.util.PermUtil;
 
 import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.managers.AudioManager;
 
 public class PlayCommand extends MusicClientCommand{
 
@@ -29,37 +39,148 @@ public class PlayCommand extends MusicClientCommand{
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
 		Guild guild = event.getGuild();
-		Biscuit b = Biscuit.getBiscuit(guild);
-		
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(guild);
+
 		int searchArg = 0;
+
+		boolean playFirst = false;
 		boolean scSearch = false;
-		
-		if(args[0].equalsIgnoreCase("-sc")) {
-			scSearch = true;
-			searchArg = 1;
+		boolean isFile = false;
+
+		if(args[0].equalsIgnoreCase("-first")) {
+			searchArg += 1;
+			if(!PermUtil.hasMusicControl(event.getMember())) {
+				MessageText.send(event.getChannel().asTextChannel(), "You do not have permission to do this!");
+				return;
+			}
+			playFirst = true;
 		}
 
-		String searchPhrase = PlayCommandUtil.getSearchPhrase(args, searchArg);
+		if(args[searchArg].equalsIgnoreCase("-sc")) {
+			scSearch = true;
+			searchArg += 1;
+		}else if (args[searchArg].equalsIgnoreCase("-file") || args[searchArg].equalsIgnoreCase("-fileid") || args[searchArg].equalsIgnoreCase("-fid")) {
+			isFile = true;
+			searchArg += 1;
+		}
+
+		String searchPhrase = getSearchPhrase(args, searchArg);
 
 		b.log(event.getAuthor().getName() + " issued a command: -play " + searchPhrase);
 
-		boolean connected = PlayCommandUtil.connectToChannel(event);
+		boolean connected = connectToChannel(event);
 		if(!connected) {
 			return;
 		}
-		
+
 		PlayRequest request;
 		ResultHandler handler;
-		
+
 		if(scSearch) {
-			request = PlayRequest.createPlayRequest(RequestType.SOUNDCLOUD, event.getMessage(), searchPhrase);
+			if(playFirst) {
+				request = PlayRequest.createPlayRequest(RequestType.SOUNDCLOUD_PRIORITY, event.getMessage(), searchPhrase, 1);
+			} else {
+				request = PlayRequest.createPlayRequest(RequestType.SOUNDCLOUD, event.getMessage(), searchPhrase);
+			}
 			handler = new SCResultHandler((SCRequest)request);
+		}else if(isFile) {
+			File file = AudioUtil.getAudioFile(searchPhrase);
+			if(file == null) {
+				MessageText.send(event.getChannel().asTextChannel(), "Unable to locate file.");
+				if(b.getAudioScheduler().getQueue().isEmpty()) {
+					b.getGuild().getAudioManager().closeAudioConnection();
+				}
+				return;
+			}
+			String filename = file.getPath();
+			if(playFirst) {
+				request = PlayRequest.createPlayRequest(RequestType.FILE_PRIORITY, event.getMessage(), filename, 1);
+			}else {
+				request = PlayRequest.createPlayRequest(RequestType.FILE, event.getMessage(), filename);
+			}
+			
+			handler = new FileResultHandler((FileRequest)request);
+
+			Main.getPlayerManager().loadItemOrdered(guild, filename,  handler);
+			return;
 		}else {
-			request = PlayRequest.createPlayRequest(event.getMessage(), searchPhrase);
+			if(playFirst) {
+				request = PlayRequest.createPlayRequest(event.getMessage(), searchPhrase, 1);
+			}else {
+				request = PlayRequest.createPlayRequest(event.getMessage(), searchPhrase);
+			}
 			handler = new YTResultHandler((YTRequest)request);
 		}
+
+		Main.getPlayerManager().loadItemOrdered(guild, getID(event),  handler);
+	}
+	
+	public static boolean connectToChannel(MessageReceivedEvent event) {
+		if(!event.isFromGuild()) {
+			return false;
+		}
+		Guild guild = event.getGuild();
+		BiscuitGuild biscuit = BiscuitGuild.getBiscuitGuild(guild);
+		TextChannel textChannel = event.getChannel().asTextChannel();
 		
-		Main.getPlayerManager().loadItemOrdered(guild, PlayCommandUtil.getID(event),  handler);
+		String vcname = "";
+		if(!event.getMember().getVoiceState().inAudioChannel()) {
+			MessageText.send(textChannel, "You must be in a voice channel to do this!");
+			return false;
+		}
+		vcname = event.getMember().getVoiceState().getChannel().getName();
+		String[] musicChannels = biscuit.getProperties().getMusicChannels();
+		if(musicChannels.length >= 1) {	
+			boolean found = false;
+			for(String cname : musicChannels) {
+				if(event.getMember().getVoiceState().getChannel().getName().equalsIgnoreCase(cname)) {
+					found = true;
+					break;
+				}
+			}
+			if(found == false) {
+				MessageText.send(textChannel, "You are not in a channel that is authorized to use the music player.");
+				return false;
+			}
+		}
+
+		if(biscuit.getAudioPlayer().getPlayingTrack() != null && guild.getAudioManager().isConnected() && !guild.getAudioManager().getConnectedChannel().getMembers().contains(event.getMember())) {
+			MessageText.send(textChannel, "Music is already playing in a voice channel. Connect to "
+					+ "that channel, then queue your song.");
+			return false;
+		}
+
+		VoiceChannel voiceChannel = guild.getVoiceChannelsByName(vcname, true).get(0);
+		AudioManager manager = guild.getAudioManager();
+
+		manager.setSendingHandler(new AudioHandler(biscuit.getAudioPlayer()));
+		manager.openAudioConnection(voiceChannel);	
+		return true;
+	}
+	
+	private String getSearchPhrase(String[] args, int startArg) {
+		if(startArg >= args.length) {
+			return "";
+		}
+		String searchPhrase = args[startArg];
+		if(args.length > startArg + 1) {
+			for(int i = startArg + 1; i < args.length; i++) {
+				searchPhrase = searchPhrase + " " + args[i];
+			}
+		}
+		return searchPhrase;
+	}
+	
+	private String getID(MessageReceivedEvent event) {
+		return getID(event.getMessage().getContentRaw().split(" ")[1]);
+	}
+	
+	private String getID(String url) {
+		String[] s = url.split("=");
+		if(s.length > 1) {
+			return s[1].split("&")[0];
+		}
+		return url;
 	}
 
 }

src/main/java/com/fpghoti/biscuit/commands/discord/music/PlayFirstCommand.java

@@ -1,75 +0,0 @@
-package com.fpghoti.biscuit.commands.discord.music;
-
-import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.audio.PlayCommandUtil;
-import com.fpghoti.biscuit.audio.request.PlayRequest;
-import com.fpghoti.biscuit.audio.request.RequestType;
-import com.fpghoti.biscuit.audio.request.soundcloud.SCRequest;
-import com.fpghoti.biscuit.audio.request.youtube.YTRequest;
-import com.fpghoti.biscuit.audio.result.ResultHandler;
-import com.fpghoti.biscuit.audio.result.SCResultHandler;
-import com.fpghoti.biscuit.audio.result.YTResultHandler;
-import com.fpghoti.biscuit.biscuit.Biscuit;
-import com.fpghoti.biscuit.commands.base.MusicClientCommand;
-import com.fpghoti.biscuit.rest.MessageText;
-import com.fpghoti.biscuit.util.PermUtil;
-
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
-//import net.dv8tion.jda.api.entities.TextChannel;
-import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
-
-public class PlayFirstCommand extends MusicClientCommand{
-
-	public PlayFirstCommand() {
-		name = "Play First";
-		description = "Places specified song at the front of the queue.";
-		usage = Main.getMainBiscuit().getProperties().getCommandSignifier() + "playfirst <Link OR Search Phrase>";
-		minArgs = 1;
-		maxArgs = 2000;
-		identifiers.add("playfirst");
-	}
-
-	@Override
-	public void execute(String[] args, MessageReceivedEvent event) {
-		Guild guild = event.getGuild();
-		Biscuit b = Biscuit.getBiscuit(guild);
-		TextChannel tchannel = event.getChannel().asTextChannel();
-
-		int searchArg = 0;
-		boolean scSearch = false;
-		
-		if(args[0].equalsIgnoreCase("-sc")) {
-			scSearch = true;
-			searchArg = 1;
-		}
-
-		String searchPhrase = PlayCommandUtil.getSearchPhrase(args, searchArg);
-
-		b.log(event.getAuthor().getName() + " issued a command: -playfirst " + searchPhrase);
-		
-		if(!PermUtil.hasMusicControl(event.getMember())) {
-			MessageText.send(tchannel, "You do not have permission to do this!");
-			return;
-		}
-		
-		boolean connected = PlayCommandUtil.connectToChannel(event);
-		if(!connected) {
-			return;
-		}
-		
-		PlayRequest request;
-		ResultHandler handler;
-		
-		if(scSearch) {
-			request = PlayRequest.createPlayRequest(RequestType.SOUNDCLOUD_PRIORITY, event.getMessage(), searchPhrase, 1);
-			handler = new SCResultHandler((SCRequest)request);
-		}else {
-			request = PlayRequest.createPlayRequest(event.getMessage(), searchPhrase, 1);
-			handler = new YTResultHandler((YTRequest)request);
-		}
-		
-		Main.getPlayerManager().loadItemOrdered(guild, PlayCommandUtil.getID(event),  handler);
-	}
-
-}

src/main/java/com/fpghoti/biscuit/commands/discord/music/QueueCommand.java

@@ -3,8 +3,8 @@ package com.fpghoti.biscuit.commands.discord.music;
 import com.fpghoti.biscuit.Main;
 import com.fpghoti.biscuit.audio.queue.AudioQueue;
 import com.fpghoti.biscuit.audio.queue.QueuedTrack;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.Util;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
@@ -26,7 +26,7 @@ public class QueueCommand extends MusicClientCommand{
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
 
-		Biscuit biscuit = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild biscuit = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		biscuit.log(event.getAuthor().getName() + " issued a command: -queue");
 		int pg = 1;
 		if (args.length > 0) {

src/main/java/com/fpghoti/biscuit/commands/discord/music/RemoveCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 import com.fpghoti.biscuit.util.Util;
@@ -22,7 +22,7 @@ public class RemoveCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -remove " + args[0]);
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			if(Util.isDigit(args[0])) {

src/main/java/com/fpghoti/biscuit/commands/discord/music/ShuffleCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
@@ -20,7 +20,7 @@ public class ShuffleCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -shuffle");
 		if(b.getAudioScheduler().getQueue().getLastTrack() != null ) {
 			b.getAudioScheduler().getQueue().shuffleUserTracks(event.getAuthor().getId());

src/main/java/com/fpghoti/biscuit/commands/discord/music/SkipAllCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -21,7 +21,7 @@ public class SkipAllCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -skipall");
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			MessageText.send(event.getChannel().asTextChannel(), "Force skipping all songs.");

src/main/java/com/fpghoti/biscuit/commands/discord/music/SkipCommand.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 
 import com.fpghoti.biscuit.Main;
 import com.fpghoti.biscuit.audio.AudioScheduler;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 
 import net.dv8tion.jda.api.entities.Guild;
@@ -29,7 +29,7 @@ public class SkipCommand extends MusicClientCommand{
 	public void execute(String[] args, MessageReceivedEvent event) {
 
 		Guild guild = event.getGuild();
-		Biscuit biscuit = Biscuit.getBiscuit(guild);
+		BiscuitGuild biscuit = BiscuitGuild.getBiscuitGuild(guild);
 		biscuit.log(event.getAuthor().getName() + " issued a command: -skip");
 
 		TextChannel cmdChannel = event.getChannel().asTextChannel();

src/main/java/com/fpghoti/biscuit/commands/discord/music/TogglePauseCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -22,7 +22,7 @@ public class TogglePauseCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -togglepause");
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			if(b.getAudioPlayer().isPaused()) {

src/main/java/com/fpghoti/biscuit/commands/discord/music/UnpauseCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 
@@ -22,7 +22,7 @@ public class UnpauseCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		b.log(event.getAuthor().getName() + " issued a command: -unpause");
 		if(PermUtil.hasMusicControl(event.getMember())) {
 			if(b.getAudioPlayer().isPaused()) {

src/main/java/com/fpghoti/biscuit/commands/discord/music/VolumeCommand.java

@@ -1,8 +1,8 @@
 package com.fpghoti.biscuit.commands.discord.music;
 
 import com.fpghoti.biscuit.Main;
-import com.fpghoti.biscuit.biscuit.Biscuit;
 import com.fpghoti.biscuit.commands.base.MusicClientCommand;
+import com.fpghoti.biscuit.guild.BiscuitGuild;
 import com.fpghoti.biscuit.rest.MessageText;
 import com.fpghoti.biscuit.util.PermUtil;
 import com.fpghoti.biscuit.util.Util;
@@ -23,7 +23,7 @@ public class VolumeCommand extends MusicClientCommand{
 
 	@Override
 	public void execute(String[] args, MessageReceivedEvent event) {
-		Biscuit b = Biscuit.getBiscuit(event.getGuild());
+		BiscuitGuild b = BiscuitGuild.getBiscuitGuild(event.getGuild());
 		
 		if(args.length < 1) {
 			b.log(event.getAuthor().getName() + " issued a command: -volume");