diff --git a/base/JaBa.js b/base/JaBa.js
index 11c37ae6..55557df3 100644
--- a/base/JaBa.js
+++ b/base/JaBa.js
@@ -1,6 +1,6 @@
 const { Client, Collection, SlashCommandBuilder, ContextMenuCommandBuilder } = require("discord.js"),
 	{ GiveawaysManager } = require("discord-giveaways"),
-	{ Player } = require("discord-player"),
+	Player = require("../helpers/Music/Player"),
 	{ REST } = require("@discordjs/rest"),
 	{ Routes } = require("discord-api-types/v10"),
 	{ DiscordTogether } = require("../helpers/discordTogether");
@@ -57,29 +57,28 @@ class JaBa extends Client {
 
 		this.player = new Player(this);
 
-		this.player
-			.on("trackStart", async (queue, track) => {
-				const m = await queue.metadata.channel.send({ content: this.translate("music/play:NOW_PLAYING", { songName: track.title }, queue.metadata.channel.guild.data.language) });
-				if (track.durationMS > 1) {
-					setTimeout(() => {
-						if (m.deletable) m.delete();
-					}, track.durationMS);
-				} else {
-					setTimeout(() => {
-						if (m.deletable) m.delete();
-					}, (10 * 60 * 1000)); // m * s * ms
-				}
-			})
-			.on("queueEnd", queue => queue.metadata.channel.send(this.translate("music/play:QUEUE_ENDED", null, queue.metadata.channel.guild.data.language)))
-			.on("channelEmpty", queue => queue.metadata.channel.send(this.translate("music/play:STOP_EMPTY", null, queue.metadata.channel.guild.data.language)))
-			.on("connectionError", (queue, e) => {
-				console.error(e);
-				queue.metadata.channel.send({ content: this.translate("music/play:ERR_OCCURRED", { error: e.message }, queue.metadata.channel.guild.data.language) });
-			})
-			.on("error", (queue, e) => {
-				console.error(e);
-				queue.metadata.channel.send({ content: this.translate("music/play:ERR_OCCURRED", { error: e.message }, queue.metadata.channel.guild.data.language) });
-			});
+		this.player.on("trackStart", async (queue, track) => {
+			const m = await queue.metadata.channel.send({ content: this.translate("music/play:NOW_PLAYING", { songName: track.title }, queue.metadata.channel.guild.data.language) });
+			if (track.durationMS > 1) {
+				setTimeout(() => {
+					if (m.deletable) m.delete();
+				}, track.durationMS);
+			} else {
+				setTimeout(() => {
+					if (m.deletable) m.delete();
+				}, (10 * 60 * 1000)); // m * s * ms
+			}
+		});
+		this.player.on("queueEnd", queue => queue.metadata.channel.send(this.translate("music/play:QUEUE_ENDED", null, queue.metadata.channel.guild.data.language)));
+		this.player.on("channelEmpty", queue => queue.metadata.channel.send(this.translate("music/play:STOP_EMPTY", null, queue.metadata.channel.guild.data.language)));
+		this.player.on("connectionError", (queue, e) => {
+			console.error(e);
+			queue.metadata.channel.send({ content: this.translate("music/play:ERR_OCCURRED", { error: e.message }, queue.metadata.channel.guild.data.language) });
+		});
+		this.player.on("error", (queue, e) => {
+			console.error(e);
+			queue.metadata.channel.send({ content: this.translate("music/play:ERR_OCCURRED", { error: e.message }, queue.metadata.channel.guild.data.language) });
+		});
 
 		this.giveawaysManager = new GiveawaysManager(this, {
 			storage: "./giveaways.json",
diff --git a/commands/Music/play.js b/commands/Music/play.js
index 12763542..1f9cd045 100644
--- a/commands/Music/play.js
+++ b/commands/Music/play.js
@@ -1,7 +1,5 @@
-const { SlashCommandBuilder, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, PermissionsBitField } = require("discord.js"),
-	{ Track, Util } = require("discord-player");
-const BaseCommand = require("../../base/BaseCommand"),
-	playdl = require("play-dl");
+const { SlashCommandBuilder, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, PermissionsBitField } = require("discord.js");
+const BaseCommand = require("../../base/BaseCommand");
 
 class Play extends BaseCommand {
 	/**
@@ -45,32 +43,11 @@ class Play extends BaseCommand {
 		if (!perms.has(PermissionsBitField.Flags.Connect) || !perms.has(PermissionsBitField.Flags.Speak)) return interaction.editReply({ content: interaction.translate("music/play:VOICE_CHANNEL_CONNECT") });
 
 		try {
-			var searchResult;
-			if (!query.includes("http")) {
-				const search = await playdl.search(query, { limit: 10 });
-
-				if (search) {
-					const found = search.map(track => new Track(client.player, {
-						title: track.title,
-						duration:  Util.buildTimeCode(Util.parseMS(track.durationInSec * 1000)),
-						thumbnail: track.thumbnails[0].url || "https://cdn.discordapp.com/attachments/708642702602010684/1012418217660121089/noimage.png",
-						views: track.views,
-						author: track.channel.name,
-						description: "search",
-						url: track.url,
-						requestedBy: interaction.user,
-						playlist: null,
-						source: "youtube"
-					}));
-
-					searchResult = { playlist: null, tracks: found, searched: true };
-				}
-			} else {
-				searchResult = await client.player.search(query, {
-					requestedBy: interaction.user
-				});
-			}
+			var searchResult = await client.player.search(query, {
+				requestedBy: interaction.user
+			});
 		} catch (error) {
+			console.log(error);
 			return interaction.editReply({
 				content: interaction.translate("music/play:NO_RESULT", {
 					query,
@@ -83,23 +60,10 @@ class Play extends BaseCommand {
 			metadata: { channel: interaction.channel },
 			leaveOnEnd: true,
 			leaveOnStop: true,
-			bufferingTimeout: 1000,
-			disableVolume: false,
-			spotifyBridge: false,
-			/**
-			 *
-			 * @param {import("discord-player").Track} track
-			 * @param {import("discord-player").TrackSource} source
-			 * @param {import("discord-player").Queue} queue
-			 */
-			async onBeforeCreateStream(track, source) {
-				console.log(track, source);
-				if (source === "youtube" || source === "soundcloud")
-					return (await playdl.stream(track.url, { discordPlayerCompatibility: true })).stream;
-			}
+			bufferingTimeout: 1000
 		});
 
-		if (searchResult.searched) {
+		if (searchResult.tracks.searched) {
 			const row1 = new ActionRowBuilder()
 				.addComponents(
 					new ButtonBuilder()
diff --git a/helpers/Music/Player.js b/helpers/Music/Player.js
new file mode 100644
index 00000000..333832f8
--- /dev/null
+++ b/helpers/Music/Player.js
@@ -0,0 +1,94 @@
+const play = require("play-dl");
+const { Queue } = require("./Queue.js");
+const { Track } = require("./Track.js");
+
+class Player {
+	/**
+	 * Discord.js Client
+	 * @param {Client} client
+	 */
+	constructor(client) {
+		this.client = client;
+		this.queues = new Map();
+	}
+
+	// eslint-disable-next-line no-unused-vars
+	on(event, callback) {}
+	async search(query) {
+		if (!query) throw new Error("No search query was provided!");
+		const validate = play.yt_validate(query);
+		if (!validate) throw new Error("This is not a valid search query!");
+
+		let search, tracks;
+
+		switch (validate) {
+			case "video":
+				search = await play.search(query);
+				if (!search) throw new Error("This Track was not found!");
+				tracks = search.map(track => {
+					return new Track(track);
+				});
+				break;
+			case "playlist":
+				// eslint-disable-next-line no-case-declarations
+				const playlist = await play.playlist_info(query);
+				if (!playlist) throw new Error("Playlist not found!");
+
+				tracks = playlist.videos.map(track => {
+					return new Track(track);
+				});
+				break;
+			case "search":
+				search = await play.search(query, { limit: 10 });
+				if (!search) throw new Error("No Song was found for this query!");
+
+				tracks = search.map(track => {
+					return new Track(track);
+				});
+				tracks.searched = true;
+				break;
+		}
+
+		return tracks;
+	}
+
+	createQueue(guild, options = {}) {
+		guild = this.client.guilds.resolve(guild);
+		if (!guild)
+			throw new Error("Could not resolve guild! (Guild does not exist!)");
+
+		if (this.queues.has(guild.id)) return this.queues.get(guild.id);
+
+		const queue = new Queue(this, guild, options);
+		this.queues.set(guild.id, queue);
+
+		return queue;
+	}
+
+	async getQueue(guild) {
+		if (!guild) throw new Error("You did not provide the guild object!");
+
+		const resolveGuild = this.client.guilds.resolve(guild);
+		if (!resolveGuild)
+			throw new Error("Could not resolve guild! (Guild does not exist!)");
+
+		return this.queues.get(guild.id);
+	}
+
+	async deleteQueue(guild) {
+		if (!guild) throw new Error("You did not provide the guild object!");
+		const resolveGuild = this.client.guilds.resolve(guild);
+		if (!resolveGuild)
+			throw new Error("Could not resolve guild! (Guild does not exist!)");
+		const queue = this.getQueue(guild);
+
+		try {
+			queue.destroy();
+		} catch {} // eslint-disable-line no-empty
+		this.queues.delete(guild.id);
+
+		return queue;
+	}
+}
+
+module.exports = Player;
\ No newline at end of file
diff --git a/helpers/Music/Queue.js b/helpers/Music/Queue.js
new file mode 100644
index 00000000..ec116db0
--- /dev/null
+++ b/helpers/Music/Queue.js
@@ -0,0 +1,724 @@
+class Queue {
+	constructor(player, guild, options) {
+		this.player = player;
+		this.guild = guild;
+		this.options = options;
+		//  connection: StreamDispatcher;
+		//  tracks: Track[] = [];
+		//  previousTracks: Track[] = [];
+		//  _cooldownsTimeout = new Collection<string, NodeJS.Timeout>();
+	}
+	_playing = false;
+	_repeatMode = 0;
+	_streamTime = 0;
+	_lastVolume = 0;
+	_destroyed = false;
+
+	/**
+	 * Returns current track
+	 * @type {Track}
+	 */
+	get current() {
+		if (this.#watchDestroyed()) return;
+		return this.connection.audioResource?.metadata ?? this.tracks[0];
+	}
+
+	/**
+	 * If this queue is destroyed
+	 * @type {boolean}
+	 */
+	get destroyed() {
+		return this._destroyed;
+	}
+
+	/**
+	 * Returns current track
+	 * @returns {Track}
+	 */
+	nowPlaying() {
+		if (this.#watchDestroyed()) return;
+		return this.current;
+	}
+
+	/**
+	 * Connects to a voice channel
+	 * @param {GuildChannelResolvable} channel The voice/stage channel
+	 * @returns {Promise<Queue>}
+	 */
+	async connect(channel) {
+		if (this.#watchDestroyed()) return;
+		const _channel = this.guild.channels.resolve(channel);
+		if (!["GUILD_STAGE_VOICE", "GUILD_VOICE"].includes(_channel?.type))
+			throw new PlayerError(
+				`Channel type must be GUILD_VOICE or GUILD_STAGE_VOICE, got ${_channel?.type}!`,
+				ErrorStatusCode.INVALID_ARG_TYPE
+			);
+		const connection = await this.player.voiceUtils.connect(_channel, {
+			deaf: this.options.autoSelfDeaf,
+			maxTime: this.player.options.connectionTimeout || 20000,
+		});
+		this.connection = connection;
+
+		if (_channel.type === "GUILD_STAGE_VOICE") {
+			await _channel.guild.me.voice.setSuppressed(false).catch(async () => {
+				return await _channel.guild.me.voice
+					.setRequestToSpeak(true)
+					.catch(Util.noop);
+			});
+		}
+
+		this.connection.on("error", (err) => {
+			if (this.#watchDestroyed(false)) return;
+			this.player.emit("connectionError", this, err);
+		});
+		this.connection.on("debug", (msg) => {
+			if (this.#watchDestroyed(false)) return;
+			this.player.emit("debug", this, msg);
+		});
+
+		this.player.emit("connectionCreate", this, this.connection);
+
+		this.connection.on("start", (resource) => {
+			if (this.#watchDestroyed(false)) return;
+			this.playing = true;
+			if (!this._filtersUpdate && resource?.metadata)
+				this.player.emit(
+					"trackStart",
+					this,
+					resource?.metadata ?? this.current
+				);
+			this._filtersUpdate = false;
+		});
+
+		this.connection.on("finish", async (resource) => {
+			if (this.#watchDestroyed(false)) return;
+			this.playing = false;
+			if (this._filtersUpdate) return;
+			this._streamTime = 0;
+			if (resource && resource.metadata)
+				this.previousTracks.push(resource.metadata);
+
+			this.player.emit("trackEnd", this, resource.metadata);
+
+			if (!this.tracks.length && this.repeatMode === QueueRepeatMode.OFF) {
+				if (this.options.leaveOnEnd) this.destroy();
+				this.player.emit("queueEnd", this);
+			} else {
+				if (this.repeatMode !== QueueRepeatMode.AUTOPLAY) {
+					if (this.repeatMode === QueueRepeatMode.TRACK)
+						return void this.play(Util.last(this.previousTracks), {
+							immediate: true,
+						});
+					if (this.repeatMode === QueueRepeatMode.QUEUE)
+						this.tracks.push(Util.last(this.previousTracks));
+					const nextTrack = this.tracks.shift();
+					this.play(nextTrack, {
+						immediate: true
+					});
+					return;
+				} else {
+					this._handleAutoplay(Util.last(this.previousTracks));
+				}
+			}
+		});
+
+		return this;
+	}
+
+	/**
+	 * Destroys this queue
+	 * @param {boolean} [disconnect=this.options.leaveOnStop] If it should leave on destroy
+	 * @returns {void}
+	 */
+	destroy(disconnect = this.options.leaveOnStop) {
+		if (this.#watchDestroyed()) return;
+		if (this.connection) this.connection.end();
+		if (disconnect) this.connection?.disconnect();
+		this.player.queues.delete(this.guild.id);
+		// this.player.voiceUtils.cache.delete(this.guild.id);
+		this._destroyed = true;
+	}
+
+	/**
+	 * Skips current track
+	 * @returns {boolean}
+	 */
+	skip() {
+		if (this.#watchDestroyed()) return;
+		if (!this.connection) return false;
+		this._filtersUpdate = false;
+		this.connection.end();
+		return true;
+	}
+
+	/**
+	 * Adds single track to the queue
+	 * @param {Track} track The track to add
+	 * @returns {void}
+	 */
+	addTrack(track) {
+		if (this.#watchDestroyed()) return;
+		if (!(track instanceof Track))
+			throw new PlayerError("invalid track", ErrorStatusCode.INVALID_TRACK);
+		this.tracks.push(track);
+		this.player.emit("trackAdd", this, track);
+	}
+
+	/**
+	 * Adds multiple tracks to the queue
+	 * @param {Track[]} tracks Array of tracks to add
+	 */
+	addTracks(tracks) {
+		if (this.#watchDestroyed()) return;
+		if (!tracks.every((y) => y instanceof Track))
+			throw new PlayerError("invalid track", ErrorStatusCode.INVALID_TRACK);
+		this.tracks.push(...tracks);
+		this.player.emit("tracksAdd", this, tracks);
+	}
+
+	/**
+	 * Sets paused state
+	 * @param {boolean} paused The paused state
+	 * @returns {boolean}
+	 */
+	setPaused(paused) {
+		if (this.#watchDestroyed()) return;
+		if (!this.connection) return false;
+		return paused ? this.connection.pause(true) : this.connection.resume();
+	}
+
+	/**
+	 * Sets bitrate
+	 * @param  {number|auto} bitrate bitrate to set
+	 * @returns {void}
+	 */
+	setBitrate(bitrate) {
+		if (this.#watchDestroyed()) return;
+		if (!this.connection?.audioResource?.encoder) return;
+		if (bitrate === "auto") bitrate = this.connection.channel?.bitrate ?? 64000;
+		this.connection.audioResource.encoder.setBitrate(bitrate);
+	}
+
+	/**
+	 * Sets volume
+	 * @param {number} amount The volume amount
+	 * @returns {boolean}
+	 */
+	setVolume(amount) {
+		if (this.#watchDestroyed()) return;
+		if (!this.connection) return false;
+		this._lastVolume = amount;
+		this.options.initialVolume = amount;
+		return this.connection.setVolume(amount);
+	}
+	/**
+	 * Sets repeat mode
+	 * @param  {QueueRepeatMode} mode The repeat mode
+	 * @returns {boolean}
+	 */
+	setRepeatMode(mode) {
+		if (this.#watchDestroyed()) return;
+		if (
+			![
+				QueueRepeatMode.OFF,
+				QueueRepeatMode.QUEUE,
+				QueueRepeatMode.TRACK,
+				QueueRepeatMode.AUTOPLAY,
+			].includes(mode)
+		)
+			throw new PlayerError(
+				`Unknown repeat mode "${mode}"!`,
+				ErrorStatusCode.UNKNOWN_REPEAT_MODE
+			);
+		if (mode === this.repeatMode) return false;
+		this.repeatMode = mode;
+		return true;
+	}
+
+	/**
+	 * The current volume amount
+	 * @type {number}
+	 */
+	get volume() {
+		if (this.#watchDestroyed()) return;
+		if (!this.connection) return 100;
+		return this.connection.volume;
+	}
+
+	set volume(amount) {
+		this.setVolume(amount);
+	}
+
+	/**
+	 * The stream time of this queue
+	 * @type {number}
+	 */
+	get streamTime() {
+		if (this.#watchDestroyed()) return;
+		if (!this.connection) return 0;
+		const playbackTime = this._streamTime + this.connection.streamTime;
+		const NC = this._activeFilters.includes("nightcore") ? 1.25 : null;
+		const VW = this._activeFilters.includes("vaporwave") ? 0.8 : null;
+
+		if (NC && VW) return playbackTime * (NC + VW);
+		return NC ? playbackTime * NC : VW ? playbackTime * VW : playbackTime;
+	}
+
+	set streamTime(time) {
+		if (this.#watchDestroyed()) return;
+		this.seek(time);
+	}
+
+	/**
+	 * Returns enabled filters
+	 * @returns {AudioFilters}
+	 */
+	getFiltersEnabled() {
+		if (this.#watchDestroyed()) return;
+		return AudioFilters.names.filter((x) => this._activeFilters.includes(x));
+	}
+
+	/**
+	 * Returns disabled filters
+	 * @returns {AudioFilters}
+	 */
+	getFiltersDisabled() {
+		if (this.#watchDestroyed()) return;
+		return AudioFilters.names.filter((x) => !this._activeFilters.includes(x));
+	}
+
+	/**
+	 * Sets filters
+	 * @param {QueueFilters} filters Queue filters
+	 * @returns {Promise<void>}
+	 */
+
+	/**
+	 * Seeks to the given time
+	 * @param {number} position The position
+	 * @returns {boolean}
+	 */
+	async seek(position) {
+		if (this.#watchDestroyed()) return;
+		if (!this.playing || !this.current) return false;
+		if (position < 1) position = 0;
+		if (position >= this.current.durationMS) return this.skip();
+
+		await this.play(this.current, {
+			immediate: true,
+			filtersUpdate: true, // to stop events
+			seek: position,
+		});
+
+		return true;
+	}
+
+	/**
+	 * Plays previous track
+	 * @returns {Promise<void>}
+	 */
+	async back() {
+		if (this.#watchDestroyed()) return;
+		const prev = this.previousTracks[this.previousTracks.length - 2]; // because last item is the current track
+		if (!prev)
+			throw new PlayerError(
+				"Could not find previous track",
+				ErrorStatusCode.TRACK_NOT_FOUND
+			);
+
+		return await this.play(prev, {
+			immediate: true
+		});
+	}
+
+	/**
+	 * Clear this queue
+	 */
+	clear() {
+		if (this.#watchDestroyed()) return;
+		this.tracks = [];
+		this.previousTracks = [];
+	}
+
+	/**
+	 * Stops the player
+	 * @returns {void}
+	 */
+	stop() {
+		if (this.#watchDestroyed()) return;
+		return this.destroy();
+	}
+
+	/**
+	 * Shuffles this queue
+	 * @returns {boolean}
+	 */
+	shuffle() {
+		if (this.#watchDestroyed()) return;
+		if (!this.tracks.length || this.tracks.length < 3) return false;
+		const currentTrack = this.tracks.shift();
+
+		for (let i = this.tracks.length - 1; i > 0; i--) {
+			const j = Math.floor(Math.random() * (i + 1));
+			[this.tracks[i], this.tracks[j]] = [this.tracks[j], this.tracks[i]];
+		}
+
+		this.tracks.unshift(currentTrack);
+
+		return true;
+	}
+
+	/**
+	 * Removes a track from the queue
+	 * @param {Track|Snowflake|number} track The track to remove
+	 * @returns {Track}
+	 */
+	remove(track) {
+		if (this.#watchDestroyed()) return;
+		let trackFound = null;
+		if (typeof track === "number") {
+			trackFound = this.tracks[track];
+			if (trackFound) {
+				this.tracks = this.tracks.filter((t) => t.id !== trackFound.id);
+			}
+		} else {
+			trackFound = this.tracks.find(
+				(s) => s.id === (track instanceof Track ? track.id : track)
+			);
+			if (trackFound) {
+				this.tracks = this.tracks.filter((s) => s.id !== trackFound.id);
+			}
+		}
+
+		return trackFound;
+	}
+
+	/**
+	 * Jumps to particular track
+	 * @param {Track|number} track The track
+	 * @returns {void}
+	 */
+	jump(track) {
+		if (this.#watchDestroyed()) return;
+		// remove the track if exists
+		const foundTrack = this.remove(track);
+		if (!foundTrack)
+			throw new PlayerError("Track not found", ErrorStatusCode.TRACK_NOT_FOUND);
+		// since we removed the existing track from the queue,
+		// we now have to place that to position 1
+		// because we want to jump to that track
+		// this will skip current track and play the next one which will be the foundTrack
+		this.tracks.splice(1, 0, foundTrack);
+
+		return void this.skip();
+	}
+
+	/**
+	 * Inserts the given track to specified index
+	 * @param {Track} track The track to insert
+	 * @param {number} [index=0] The index where this track should be
+	 */
+	insert(track, index = 0) {
+		if (!track || !(track instanceof Track))
+			throw new PlayerError(
+				"track must be the instance of Track",
+				ErrorStatusCode.INVALID_TRACK
+			);
+		if (typeof index !== "number" || index < 0 || !Number.isFinite(index))
+			throw new PlayerError(
+				`Invalid index "${index}"`,
+				ErrorStatusCode.INVALID_ARG_TYPE
+			);
+
+		this.tracks.splice(index, 0, track);
+
+		this.player.emit("trackAdd", this, track);
+	}
+
+	/**
+	 * @typedef {object} PlayerTimestamp
+	 * @property {string} current The current progress
+	 * @property {string} end The total time
+	 * @property {number} progress Progress in %
+	 */
+
+	/**
+	 * Returns player stream timestamp
+	 * @returns {PlayerTimestamp}
+	 */
+	getPlayerTimestamp() {
+		if (this.#watchDestroyed()) return;
+		const currentStreamTime = this.streamTime;
+		const totalTime = this.current.durationMS;
+
+		const currentTimecode = Util.buildTimeCode(Util.parseMS(currentStreamTime));
+		const endTimecode = Util.buildTimeCode(Util.parseMS(totalTime));
+
+		return {
+			current: currentTimecode,
+			end: endTimecode,
+			progress: Math.round((currentStreamTime / totalTime) * 100),
+		};
+	}
+
+	/**
+	 * Creates progress bar string
+	 * @param {PlayerProgressbarOptions} options The progress bar options
+	 * @returns {string}
+	 */
+	createProgressBar(options = {
+		timecodes: true
+	}) {
+		if (this.#watchDestroyed()) return;
+		const length =
+			typeof options.length === "number" ?
+			options.length <= 0 || options.length === Infinity ?
+			15 :
+			options.length :
+			15;
+
+		const index = Math.round(
+			(this.streamTime / this.current.durationMS) * length
+		);
+		const indicator =
+			typeof options.indicator === "string" && options.indicator.length > 0 ?
+			options.indicator :
+			"🔘";
+		const line =
+			typeof options.line === "string" && options.line.length > 0 ?
+			options.line :
+			"▬";
+
+		if (index >= 1 && index <= length) {
+			const bar = line.repeat(length - 1).split("");
+			bar.splice(index, 0, indicator);
+			if (options.timecodes) {
+				const timestamp = this.getPlayerTimestamp();
+				return `${timestamp.current} ┃ ${bar.join("")} ┃ ${timestamp.end}`;
+			} else {
+				return `${bar.join("")}`;
+			}
+		} else {
+			if (options.timecodes) {
+				const timestamp = this.getPlayerTimestamp();
+				return `${timestamp.current} ┃ ${indicator}${line.repeat(
+					length - 1
+				)} ┃ ${timestamp.end}`;
+			} else {
+				return `${indicator}${line.repeat(length - 1)}`;
+			}
+		}
+	}
+
+	/**
+	 * Total duration
+	 * @type {Number}
+	 */
+	get totalTime() {
+		if (this.#watchDestroyed()) return;
+		return this.tracks.length > 0 ?
+			this.tracks.map((t) => t.durationMS).reduce((p, c) => p + c) :
+			0;
+	}
+
+	/**
+	 * Play stream in a voice/stage channel
+	 * @param {Track} [src] The track to play (if empty, uses first track from the queue)
+	 * @param {PlayOptions} [options={}] The options
+	 * @returns {Promise<void>}
+	 */
+	async play(src, options = {}) {
+		if (this.#watchDestroyed(false)) return;
+		if (!this.connection || !this.connection.voiceConnection)
+			throw new PlayerError(
+				"Voice connection is not available, use <Queue>.connect()!",
+				ErrorStatusCode.NO_CONNECTION
+			);
+		if (src && (this.playing || this.tracks.length) && !options.immediate)
+			return this.addTrack(src);
+		const track =
+			options.filtersUpdate && !options.immediate ?
+			src || this.current :
+			src ?? this.tracks.shift();
+		if (!track) return;
+
+		this.player.emit("debug", this, "Received play request");
+
+		if (!options.filtersUpdate) {
+			this.previousTracks = this.previousTracks.filter(
+				(x) => x.id !== track.id
+			);
+			this.previousTracks.push(track);
+		}
+
+		// TODO: remove discord-ytdl-core
+		let stream;
+		if (["youtube", "spotify"].includes(track.raw.source)) {
+			if (track.raw.source === "spotify" && !track.raw.engine) {
+				track.raw.engine = await YouTube.search(
+						`${track.author} ${track.title}`, {
+							type: "video"
+						}
+					)
+					.then((x) => x[0].url)
+					.catch(() => null);
+			}
+			const link =
+				track.raw.source === "spotify" ? track.raw.engine : track.url;
+			if (!link)
+				return void this.play(this.tracks.shift(), {
+					immediate: true
+				});
+
+			stream = ytdl(link, {
+				...this.options.ytdlOptions,
+				// discord-ytdl-core
+				opusEncoded: false,
+				fmt: "s16le",
+				encoderArgs: options.encoderArgs ?? this._activeFilters.length ?
+					["-af", AudioFilters.create(this._activeFilters)] :
+					[],
+				seek: options.seek ? options.seek / 1000 : 0,
+			}).on("error", (err) => {
+				return err.message.toLowerCase().includes("premature close") ?
+					null :
+					this.player.emit("error", this, err);
+			});
+		} else {
+			stream = ytdl
+				.arbitraryStream(
+					track.raw.source === "soundcloud" ?
+					await track.raw.engine.downloadProgressive() :
+					typeof track.raw.engine === "function" ?
+					await track.raw.engine() :
+					track.raw.engine, {
+						opusEncoded: false,
+						fmt: "s16le",
+						encoderArgs: options.encoderArgs ?? this._activeFilters.length ?
+							["-af", AudioFilters.create(this._activeFilters)] :
+							[],
+						seek: options.seek ? options.seek / 1000 : 0,
+					}
+				)
+				.on("error", (err) => {
+					return err.message.toLowerCase().includes("premature close") ?
+						null :
+						this.player.emit("error", this, err);
+				});
+		}
+
+		const resource = this.connection.createStream(stream, {
+			type: StreamType.Raw,
+			data: track,
+		});
+
+		if (options.seek) this._streamTime = options.seek;
+		this._filtersUpdate = options.filtersUpdate;
+		this.setVolume(this.options.initialVolume);
+
+		setTimeout(() => {
+			this.connection.playStream(resource);
+		}, this.#getBufferingTimeout()).unref();
+	}
+
+	/**
+	 * Private method to handle autoplay
+	 * @param {Track} track The source track to find its similar track for autoplay
+	 * @returns {Promise<void>}
+	 * @private
+	 */
+	async _handleAutoplay(track) {
+		if (this.#watchDestroyed()) return;
+		if (!track || ![track.source, track.raw?.source].includes("youtube")) {
+			if (this.options.leaveOnEnd) this.destroy();
+			return void this.player.emit("queueEnd", this);
+		}
+		const info = await YouTube.getVideo(track.url)
+			.then((x) => x.videos[0])
+			.catch(Util.noop);
+		if (!info) {
+			if (this.options.leaveOnEnd) this.destroy();
+			return void this.player.emit("queueEnd", this);
+		}
+
+		const nextTrack = new Track(this.player, {
+			title: info.title,
+			url: `https://www.youtube.com/watch?v=${info.id}`,
+			duration: info.durationFormatted ?
+				Util.buildTimeCode(Util.parseMS(info.duration * 1000)) :
+				"0:00",
+			description: "",
+			thumbnail: typeof info.thumbnail === "string" ?
+				info.thumbnail :
+				info.thumbnail.url,
+			views: info.views,
+			author: info.channel.name,
+			requestedBy: track.requestedBy,
+			source: "youtube",
+		});
+
+		this.play(nextTrack, {
+			immediate: true
+		});
+	}
+
+	*[Symbol.iterator]() {
+		if (this.#watchDestroyed()) return;
+		yield* this.tracks;
+	}
+
+	/**
+	 * JSON representation of this queue
+	 * @returns {object}
+	 */
+	toJSON() {
+		if (this.#watchDestroyed()) return;
+		return {
+			id: this.id,
+			guild: this.guild.id,
+			voiceChannel: this.connection?.channel?.id,
+			options: this.options,
+			tracks: this.tracks.map((m) => m.toJSON()),
+		};
+	}
+
+	/**
+	 * String representation of this queue
+	 * @returns {string}
+	 */
+	toString() {
+		if (this.#watchDestroyed()) return;
+		if (!this.tracks.length) return "No songs available to display!";
+		return `**Upcoming Songs:**\n${this.tracks
+			.map((m, i) => `${i + 1}. **${m.title}**`)
+			.join("\n")}`;
+	}
+
+	#watchDestroyed(emit = true) {
+		if (this._destroyed) {
+			if (emit)
+				this.player.emit(
+					"error",
+					this,
+					new PlayerError(
+						"Cannot use destroyed queue",
+						ErrorStatusCode.DESTROYED_QUEUE
+					)
+				);
+			return true;
+		}
+
+		return false;
+	}
+
+	#getBufferingTimeout() {
+		const timeout = this.options.bufferingTimeout;
+
+		if (isNaN(timeout) || timeout < 0 || !Number.isFinite(timeout)) return 1000;
+		return timeout;
+	}
+}
+
+module.exports = {
+	Queue
+};
diff --git a/helpers/Music/Track.js b/helpers/Music/Track.js
new file mode 100644
index 00000000..1ca2659b
--- /dev/null
+++ b/helpers/Music/Track.js
@@ -0,0 +1,31 @@
+class Track {
+	title = null;
+	url = null;
+	thumbnail = {};
+	duration = null;
+	type = null;
+	description = null;
+	views = null;
+	channel = {};
+	private = null;
+
+	constructor(tracks) {
+		if (!tracks) throw new Error("Constructor was not initialized properly!");
+		this.title = tracks.title || tracks.videos?.title || tracks.video_details.title;
+		this.url = tracks.url || tracks.videos.url || tracks.video_details.url;
+		this.thumbnail = {
+			url: tracks?.thumbnail.url || tracks.thumbnails[0].url,
+		};
+		this.duration = tracks.durationInSec || tracks.videos?.durationInSec || tracks.video_details.durationInSec;
+		this.type = tracks.type;
+		this.description = tracks?.description || tracks.videos?.description || tracks.video_details.description;
+		this.views = tracks?.views || tracks.video_details.views;
+		this.channel = {
+			name: tracks?.channel.name || tracks.videos?.channel.name || tracks.video_details.channel.name,
+			url: tracks?.channel.url || tracks.videos?.channel.url || tracks.video_details.channel.url,
+		};
+		this.private = tracks?.private || tracks?.videos?.private || tracks.video_details.private || false;
+	}
+}
+
+module.exports = { Track };
\ No newline at end of file
diff --git a/helpers/Music/Util/Utilities.js b/helpers/Music/Util/Utilities.js
new file mode 100644
index 00000000..21628aa1
--- /dev/null
+++ b/helpers/Music/Util/Utilities.js
@@ -0,0 +1,6 @@
+class Utilities {
+  wait(time) {
+    return new Promise((r) => setTimeout(r, time).unref());
+  }
+}
+module.exports = { Utilities };
diff --git a/helpers/Music/Voice/streamdiscpatcher.js b/helpers/Music/Voice/streamdiscpatcher.js
new file mode 100644
index 00000000..f0b32c1a
--- /dev/null
+++ b/helpers/Music/Voice/streamdiscpatcher.js
@@ -0,0 +1,156 @@
+const { AudioPlayer,
+  AudioPlayerStatus,
+  createAudioPlayer,
+  createAudioResource,
+  entersState,
+  StreamType,
+  VoiceConnection,
+  VoiceConnectionStatus,
+  VoiceConnectionDisconnectReason } = require("@discordjs/voice");
+
+const TypedEmitter = require("tiny-typed-emitter");
+const { Utilities } = require("../Util/Utilities.js")
+
+class StreamDispatcher extends TypedEmitter {
+  voiceConnection = null;
+  audioPlayer = null;
+  channel = null;
+  audioResource = null;
+  readyLock = false;
+  paused = null;
+
+  constructor(voiceConnection, channel, connectionTimeout = 20000) {
+    super();
+
+    this.voiceConnection = voiceConnection;
+    this.audioPlayer = createAudioPlayer();
+    this.channel = channel;
+    this.paused = false;
+
+    this.voiceConnection.on("stateChange", async (_, newState) => {
+      if (newState.status === VoiceConnectionStatus.Disconnected) {
+        if (
+          newState.reason === VoiceConnectionDisconnectReason.WebSocketClose &&
+          newState.closeCode === 4014
+        ) {
+          try {
+            await entersState(
+              this.voiceConnection,
+              VoiceConnectionStatus.Connecting,
+              connectionTimeout
+            );
+          } catch {
+            this.voiceConnection.destroy();
+          }
+        } else if (this.voiceConnection.rejoinAttempts < 5) {
+          await Utilities.wait(
+            (this.voiceConnection.rejoinAttempts + 1) * 5000
+          );
+          this.voiceConnection.rejoin();
+        } else {
+          this.voiceConnection.destroy();
+        }
+      } else if (newState.status === VoiceConnectionStatus.Destroyed) {
+        this.end();
+      } else if (
+        !this.readyLock &&
+        (newState.status === VoiceConnectionStatus.Connecting ||
+          newState.status === VoiceConnectionStatus.Signalling)
+      ) {
+        this.readyLock = true;
+        try {
+          await entersState(
+            this.voiceConnection,
+            VoiceConnectionStatus.Ready,
+            connectionTimeout
+          );
+        } catch {
+          if (
+            this.voiceConnection.state.status !==
+            VoiceConnectionStatus.Destroyed
+          )
+            this.voiceConnection.destroy();
+        } finally {
+          this.readyLock = false;
+        }
+      }
+    });
+
+    this.audioPlayer.on("stateChange", (oldState, newState) => {
+      if (newState.status === AudioPlayerStatus.Playing) {
+        if (!this.paused) return void this.emit("start", this.audioResource);
+      } else if (
+        newState.status === AudioPlayerStatus.Idle &&
+        oldState.status !== AudioPlayerStatus.Idle
+      ) {
+        if (!this.paused) {
+          void this.emit("finish", this.audioResource);
+          this.audioResource = null;
+        }
+      }
+    });
+
+    this.audioPlayer.on("debug", (m) => void this.emit("debug", m));
+    this.audioPlayer.on("error", (error) => void this.emit("error", error));
+    this.voiceConnection.subscribe(this.audioPlayer);
+  }
+
+  createStream(src, ops = { type?: "", data?: "" }) {
+    this.audioResource = createAudioResource(src, {
+      inputType: ops?.type ?? StreamType.Arbitrary,
+      metadata: ops?.data,
+      inlineVolume: true,
+    });
+    return this.audioResource;
+  }
+
+  status() {
+    return this.audioPlayer.state.status;
+  }
+
+  disconnect() {
+    try {
+      this.audioPlayer.stop(true);
+      this.voiceConnection.destroy();
+    } catch { }
+  }
+
+  end() {
+    this.audioPlayer.stop();
+  }
+
+  pause(interpolateSilence) {
+    const success = this.audioPlayer.pause(interpolateSilence);
+    this.paused = success;
+    return success;
+  }
+
+  resume() {
+    const success = this.audioPlayer.unpause();
+    this.paused = !success;
+    return success;
+  }
+
+  async playStream(resource = this.audioResource) {
+    if (!resource) throw new PlayerError("Audio resource is not available!", ErrorStatusCode.NO_AUDIO_RESOURCE);
+    if (resource.ended) return void this.emit("error", new PlayerError("Cannot play a resource that has already ended."));
+    if (!this.audioResource) this.audioResource = resource;
+    if (this.voiceConnection.state.status !== VoiceConnectionStatus.Ready) {
+      try {
+        await entersState(this.voiceConnection, VoiceConnectionStatus.Ready, this.connectionTimeout);
+      } catch (err) {
+        return void this.emit("error", err);
+      }
+    }
+
+    try {
+      this.audioPlayer.play(resource);
+    } catch (e) {
+      this.emit("error", e);
+    }
+
+    return this;
+  }
+}
+
+module.exports = { StreamDispatcher }
\ No newline at end of file
diff --git a/helpers/Music/Voice/voiceutils.js b/helpers/Music/Voice/voiceutils.js
new file mode 100644
index 00000000..c14fbfbf
--- /dev/null
+++ b/helpers/Music/Voice/voiceutils.js
@@ -0,0 +1,54 @@
+class VoiceUtils {
+  /**
+   *
+   * @param {VoiceChannel} channels
+   * @param {Options} options
+   * @returns
+   */
+
+  async connect(channel, options = {}) {
+    const conn = await this.join(channel, options);
+    const sub = new StreamDispatcher(conn, channel, options.maxTime);
+    return sub;
+  }
+
+  /**
+   *
+   * @param {VoiceChannel} channel
+   * @returns
+   */
+
+  async join(channel) {
+    let conn = joinVoiceChannel({
+      guildId: channel.guild.id,
+      channelId: channel.id,
+      adapterCreator: channel.guild.voiceAdapterCreator,
+      selfDeaf: Boolean(options.deaf),
+    });
+
+    try {
+      conn = await entersState(
+        conn,
+        VoiceConnectionStatus.Ready,
+        options?.maxTime ?? 20000
+      );
+      return conn;
+    } catch (err) {
+      conn.destroy();
+      throw err;
+    }
+  }
+
+  /**
+   *
+   * @param {VoiceConnection} connection
+   * @returns
+   */
+
+  disconnect(connection) {
+    if (connection) return connection.voiceConnection.destroy();
+    return connection.destroy();
+  }
+}
+
+module.exports = { VoiceUtils };
diff --git a/package-lock.json b/package-lock.json
index ea5f3449..5dfa3e16 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,8 @@
                 "moment": "^2.26.0",
                 "mongoose": "^5.13.15",
                 "ms": "^2.1.3",
-                "play-dl": "^1.9.5"
+                "play-dl": "^1.9.5",
+                "tiny-typed-emitter": "^2.1.0"
             },
             "devDependencies": {
                 "eslint": "^8.23.0"
diff --git a/package.json b/package.json
index 522481ee..1d6a13d0 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,8 @@
         "moment": "^2.26.0",
         "mongoose": "^5.13.15",
         "ms": "^2.1.3",
-        "play-dl": "^1.9.5"
+        "play-dl": "^1.9.5",
+        "tiny-typed-emitter": "^2.1.0"
     },
     "devDependencies": {
         "eslint": "^8.23.0"