diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000..b9acba7
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,71 @@
+name: Publish
+on:
+  push:
+  release:
+    types: [ published ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+      LAVALINK_MAVEN_USERNAME: ${{ secrets.LAVALINK_MAVEN_USERNAME }}
+      LAVALINK_MAVEN_PASSWORD: ${{ secrets.LAVALINK_MAVEN_PASSWORD }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 17
+          cache: gradle
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Build and Publish
+        run: ./gradlew build publish --no-daemon -PMAVEN_USERNAME=$MAVEN_USERNAME -PMAVEN_PASSWORD=$MAVEN_PASSWORD -PLAVALINK_MAVEN_USERNAME=$LAVALINK_MAVEN_USERNAME -PLAVALINK_MAVEN_PASSWORD=$LAVALINK_MAVEN_PASSWORD
+
+      - name: Upload main Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: LavaQueue.jar
+          path: main/build/libs/lavaqueue-*.jar
+
+      - name: Upload plugin Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: LavaQueue-Plugin.jar
+          path: plugin/build/libs/lavaqueue-plugin-*.jar
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    if: github.event_name == 'release'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Download main Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: LavaQueue.jar
+
+      - name: Download plugin Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: LavaQueue-Plugin.jar
+
+      - name: Upload Artifacts to GitHub Release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: lavaqueue-*.jar
+          allowUpdates: true
+          omitBodyDuringUpdate: true
+          omitDraftDuringUpdate: true
+          omitNameDuringUpdate: true
+          omitPrereleaseDuringUpdate: true
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1daf0d4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.idea/
+.gradle/
+build/
+application.yml
+logs/
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..5daf8a5
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,80 @@
+import java.io.ByteArrayOutputStream
+
+plugins {
+    `maven-publish`
+    id("org.jetbrains.kotlin.jvm") version "1.9.0" apply false
+    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.0" apply false
+}
+
+val (gitVersion, release) = versionFromGit()
+logger.lifecycle("Version: $gitVersion (release: $release)")
+
+allprojects {
+    group = "com.github.topi314.lavaqueue"
+
+    version = gitVersion
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        maven("https://maven.arbjerg.dev/releases")
+        maven("https://maven.arbjerg.dev/snapshots")
+        maven("https://jitpack.io")
+        jcenter()
+    }
+}
+
+val isMavenDefined = findProperty("MAVEN_USERNAME") != null && findProperty("MAVEN_PASSWORD") != null
+
+subprojects {
+    apply<JavaPlugin>()
+    apply<MavenPublishPlugin>()
+
+    configure<JavaPluginExtension> {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+
+    configure<PublishingExtension> {
+        if (findProperty("MAVEN_PASSWORD") != null && findProperty("MAVEN_USERNAME") != null) {
+            repositories {
+                val snapshots = "https://maven.lavalink.dev/snapshots"
+                val releases = "https://maven.lavalink.dev/releases"
+
+                maven(if (release) releases else snapshots) {
+                    credentials {
+                        password = findProperty("MAVEN_PASSWORD") as String?
+                        username = findProperty("MAVEN_USERNAME") as String?
+                    }
+                }
+            }
+        } else {
+            logger.lifecycle("Not publishing to maven.lavalink.dev because credentials are not set")
+        }
+    }
+}
+
+fun versionFromGit(): Pair<String, Boolean> {
+    var versionStr = ByteArrayOutputStream()
+    var result = exec {
+        standardOutput = versionStr
+        isIgnoreExitValue = true
+        commandLine = listOf("git", "describe", "--exact-match", "--tags")
+    }
+    if (result.exitValue == 0) {
+        return Pair(versionStr.toString().trim(), false)
+    }
+
+    versionStr = ByteArrayOutputStream()
+    result = exec {
+        standardOutput = versionStr
+        isIgnoreExitValue = true
+        commandLine = listOf("git", "rev-parse", "--short", "HEAD")
+    }
+    if (result.exitValue != 0) {
+        throw GradleException("Failed to get git version")
+    }
+
+    return Pair(versionStr.toString().trim(), true)
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..7f93135
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..29d2731
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
\ No newline at end of file
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..1b6c787
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
new file mode 100644
index 0000000..12eabf6
--- /dev/null
+++ b/main/build.gradle.kts
@@ -0,0 +1,42 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    kotlin("jvm")
+    alias(libs.plugins.lavalink)
+}
+
+base {
+    archivesName = "lavaqueue-plugin"
+}
+
+lavalinkPlugin {
+    name = "lavaqueue-plugin"
+    apiVersion = libs.versions.lavalink
+    serverVersion = libs.versions.lavalink
+    configurePublishing = false
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
+    }
+}
+
+dependencies {
+    implementation(projects.protocol)
+    compileOnly(libs.lavalink.server)
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            from(components["java"])
+            artifactId = base.archivesName.get()
+        }
+    }
+}
+
diff --git a/main/src/main/kotlin/com/github/topi314/lavaqueue/Queue.kt b/main/src/main/kotlin/com/github/topi314/lavaqueue/Queue.kt
new file mode 100644
index 0000000..00ee3cb
--- /dev/null
+++ b/main/src/main/kotlin/com/github/topi314/lavaqueue/Queue.kt
@@ -0,0 +1,61 @@
+package com.github.topi314.lavaqueue
+
+import com.github.topi314.lavaqueue.protocol.Queue
+import com.github.topi314.lavaqueue.protocol.QueueEndEvent
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayer
+import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason
+import dev.arbjerg.lavalink.api.IPlayer
+import dev.arbjerg.lavalink.api.ISocketContext
+
+class Queue(
+    private val context: ISocketContext,
+    private val player: IPlayer
+) : AudioEventAdapter() {
+
+    var type = Queue.Type.NORMAL
+    val queue = TrackQueue()
+    val history = TrackQueue()
+
+    fun next(): AudioTrack? {
+        if (queue.isNotEmpty()) {
+            val track = queue.next()
+            player.play(track!!)
+            return track
+        }
+        return null
+    }
+
+    fun previous(): AudioTrack? {
+        if (history.isNotEmpty()) {
+            val track = history.removeLast()
+            player.play(track!!)
+            return track
+        }
+        return null
+    }
+
+    override fun onTrackEnd(unused: AudioPlayer, track: AudioTrack, endReason: AudioTrackEndReason) {
+        history.add(track.makeClone())
+        if (endReason.mayStartNext) {
+            val nextTrack = when (type) {
+                Queue.Type.NORMAL -> next()
+                Queue.Type.REPEAT_TRACK -> {
+                    val nextTrack = track.makeClone()
+                    player.play(nextTrack)
+                    nextTrack
+                }
+
+                Queue.Type.REPEAT_QUEUE -> {
+                    queue.add(track.makeClone())
+                    next()
+                }
+            }
+            if (nextTrack == null) {
+                context.sendMessage(QueueEndEvent.serializer(), QueueEndEvent(player.guildId.toString()))
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/main/src/main/kotlin/com/github/topi314/lavaqueue/TrackQueue.kt b/main/src/main/kotlin/com/github/topi314/lavaqueue/TrackQueue.kt
new file mode 100644
index 0000000..5a18be1
--- /dev/null
+++ b/main/src/main/kotlin/com/github/topi314/lavaqueue/TrackQueue.kt
@@ -0,0 +1,85 @@
+package com.github.topi314.lavaqueue
+
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+
+class TrackQueue(
+    private var queue: MutableList<AudioTrack> = mutableListOf(),
+) {
+
+    fun add(track: AudioTrack) {
+        queue.add(track)
+    }
+
+    fun add(index: Int, track: AudioTrack) {
+        queue.add(index, track)
+    }
+
+    fun addAll(tracks: List<AudioTrack>) {
+        queue.addAll(tracks)
+    }
+
+    fun addAll(index: Int, tracks: List<AudioTrack>) {
+        queue.addAll(index, tracks)
+    }
+
+    fun set(tracks: List<AudioTrack>) {
+        queue = tracks.toMutableList()
+    }
+
+    fun set(index: Int, track: AudioTrack) {
+        queue[index] = track
+    }
+
+    fun get(): List<AudioTrack> {
+        return queue.toList()
+    }
+
+    fun get(index: Int): AudioTrack? {
+        return queue.getOrNull(index)
+    }
+
+    fun removeAt(index: Int): AudioTrack {
+        return queue.removeAt(index)
+    }
+
+    fun removeAt(index: Int, amount: Int) {
+        queue.subList(index, index + amount).clear()
+    }
+
+    fun clear() {
+        queue.clear()
+    }
+
+    fun shuffle() {
+        queue.shuffle()
+    }
+
+    fun isEmpty(): Boolean {
+        return queue.isEmpty()
+    }
+
+    fun isNotEmpty(): Boolean {
+        return queue.isNotEmpty()
+    }
+
+    fun size(): Int {
+        return queue.size
+    }
+
+    fun next(): AudioTrack? {
+        return queue.firstOrNull()
+    }
+
+    fun removeNext(): AudioTrack? {
+        return queue.removeFirstOrNull()
+    }
+
+    fun last(): AudioTrack? {
+        return queue.lastOrNull()
+    }
+
+    fun removeLast(): AudioTrack? {
+        return queue.removeLastOrNull()
+    }
+
+}
\ No newline at end of file
diff --git a/main/src/main/kotlin/com/github/topi314/lavaqueue/plugin/LavaQueuePlugin.kt b/main/src/main/kotlin/com/github/topi314/lavaqueue/plugin/LavaQueuePlugin.kt
new file mode 100644
index 0000000..62923e0
--- /dev/null
+++ b/main/src/main/kotlin/com/github/topi314/lavaqueue/plugin/LavaQueuePlugin.kt
@@ -0,0 +1,39 @@
+package com.github.topi314.lavaqueue.plugin
+
+import com.github.topi314.lavaqueue.Queue
+import dev.arbjerg.lavalink.api.IPlayer
+import dev.arbjerg.lavalink.api.ISocketContext
+import dev.arbjerg.lavalink.api.PluginEventHandler
+import org.springframework.stereotype.Service
+
+@Service
+class LavaQueuePlugin : PluginEventHandler() {
+
+    private val queues = mutableMapOf<String, MutableMap<Long, Queue>>()
+
+    override fun onWebSocketOpen(context: ISocketContext, resumed: Boolean) {
+        if (resumed) {
+            return
+        }
+        queues[context.sessionId] = mutableMapOf()
+    }
+
+    override fun onSocketContextDestroyed(context: ISocketContext) {
+        queues.remove(context.sessionId)
+    }
+
+    override fun onNewPlayer(context: ISocketContext, player: IPlayer) {
+        queues[context.sessionId]?.put(player.guildId, Queue(context, player))
+    }
+
+    override fun onDestroyPlayer(context: ISocketContext, player: IPlayer) {
+        queues[context.sessionId]?.remove(player.guildId)
+    }
+
+    fun getQueue(sessionId: String, guildId: Long): Queue {
+        val queue = queues[sessionId] ?: throw IllegalArgumentException("Session $sessionId not found")
+
+        return queue[guildId] ?: throw IllegalArgumentException("Queue $guildId not found")
+    }
+
+}
\ No newline at end of file
diff --git a/main/src/main/kotlin/com/github/topi314/lavaqueue/plugin/LavaQueueRestHandler.kt b/main/src/main/kotlin/com/github/topi314/lavaqueue/plugin/LavaQueueRestHandler.kt
new file mode 100644
index 0000000..b4fc0b5
--- /dev/null
+++ b/main/src/main/kotlin/com/github/topi314/lavaqueue/plugin/LavaQueueRestHandler.kt
@@ -0,0 +1,149 @@
+package com.github.topi314.lavaqueue.plugin
+
+import com.github.topi314.lavaqueue.protocol.*
+import com.github.topi314.lavaqueue.toAudioTrack
+import com.github.topi314.lavaqueue.toAudioTracks
+import com.github.topi314.lavaqueue.toQueue
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager
+import dev.arbjerg.lavalink.api.AudioPluginInfoModifier
+import dev.arbjerg.lavalink.protocol.v4.Track
+import dev.arbjerg.lavalink.protocol.v4.Tracks
+import dev.arbjerg.lavalink.protocol.v4.ifPresent
+import lavalink.server.util.toTrack
+import org.springframework.web.bind.annotation.*
+
+@RestController
+class LavaQueueRestHandler(
+    private val playerManager: AudioPlayerManager,
+    private val pluginInfoModifiers: List<AudioPluginInfoModifier>,
+    private val lavaQueuePlugin: LavaQueuePlugin
+) {
+
+    @GetMapping("/v4/sessions/{sessionId}/players/{playerId}/queue")
+    fun getQueue(@PathVariable sessionId: String, @PathVariable playerId: Long): Queue {
+        return lavaQueuePlugin.getQueue(sessionId, playerId).toQueue(playerManager, pluginInfoModifiers)
+    }
+
+    @PostMapping("/v4/sessions/{sessionId}/players/{playerId}/queue")
+    fun postQueue(
+        @PathVariable sessionId: String,
+        @PathVariable playerId: Long,
+        @RequestBody body: QueueCreate
+    ) {
+        val queue = lavaQueuePlugin.getQueue(sessionId, playerId)
+        queue.type = queue.type
+        queue.queue.set(body.tracks.toAudioTracks(playerManager))
+    }
+
+    @PatchMapping("/v4/sessions/{sessionId}/players/{playerId}/queue")
+    fun patchQueue(
+        @PathVariable sessionId: String,
+        @PathVariable playerId: Long,
+        @RequestParam index: Int?,
+        @RequestBody body: QueueUpdate,
+    ) {
+        val queue = lavaQueuePlugin.getQueue(sessionId, playerId)
+        body.type.ifPresent {
+            queue.type = it
+        }
+
+        body.tracks.ifPresent {
+            if (index != null) {
+                queue.queue.addAll(index, it.toAudioTracks(playerManager))
+                return
+            }
+            queue.queue.addAll(it.toAudioTracks(playerManager))
+        }
+    }
+
+    @PutMapping("/v4/sessions/{sessionId}/players/{playerId}/queue/tracks")
+    fun putQueueTracks(
+        @PathVariable sessionId: String,
+        @PathVariable playerId: Long,
+        @RequestBody tracks: EncodedTracks
+    ) {
+        lavaQueuePlugin.getQueue(sessionId, playerId).queue.set(tracks.toAudioTracks(playerManager).toMutableList())
+    }
+
+    @DeleteMapping("/v4/sessions/{sessionId}/players/{playerId}/tracks/queue")
+    fun deleteQueue(@PathVariable sessionId: String, @PathVariable playerId: Long) {
+        lavaQueuePlugin.getQueue(sessionId, playerId).queue.clear()
+    }
+
+    @GetMapping("/v4/sessions/{sessionId}/players/{playerId}/queue/tracks/{index}")
+    fun getQueueIndex(
+        @PathVariable sessionId: String,
+        @PathVariable playerId: Long,
+        @PathVariable index: Int
+    ): Track? {
+        return lavaQueuePlugin.getQueue(sessionId, playerId).queue.get(index)?.toTrack(playerManager, pluginInfoModifiers)
+    }
+
+    @PostMapping("/v4/sessions/{sessionId}/players/{playerId}/queue/tracks/{index}")
+    fun postQueueIndex(
+        @PathVariable sessionId: String,
+        @PathVariable playerId: Long,
+        @PathVariable index: Int,
+        @RequestBody track: EncodedTrack
+    ) {
+        lavaQueuePlugin.getQueue(sessionId, playerId).queue.set(index, track.toAudioTrack(playerManager))
+    }
+
+    @PatchMapping("/v4/sessions/{sessionId}/players/{playerId}/queue/tracks/{index}")
+    @PutMapping("/v4/sessions/{sessionId}/players/{playerId}/queue/tracks/{index}")
+    fun putQueueIndex(
+        @PathVariable sessionId: String,
+        @PathVariable playerId: Long,
+        @PathVariable index: Int,
+        @RequestBody track: EncodedTrack
+    ) {
+        lavaQueuePlugin.getQueue(sessionId, playerId).queue.set(index, track.toAudioTrack(playerManager))
+    }
+
+    @DeleteMapping("/v4/sessions/{sessionId}/players/{playerId}/queue/{index}")
+    fun deleteQueueIndex(
+        @PathVariable sessionId: String,
+        @PathVariable playerId: Long,
+        @PathVariable index: Int,
+        @RequestParam amount: Int?
+    ) {
+        if (amount == null) {
+            lavaQueuePlugin.getQueue(sessionId, playerId).queue.removeAt(index)
+            return
+        }
+        lavaQueuePlugin.getQueue(sessionId, playerId).queue.removeAt(index, amount)
+    }
+
+    @PostMapping("/v4/sessions/{sessionId}/players/{playerId}/queue/{index}/move")
+    fun getQueueIndexMove(
+        @PathVariable sessionId: String,
+        @PathVariable playerId: Long,
+        @PathVariable index: Int,
+        @RequestParam position: Int
+    ) {
+        val queue = lavaQueuePlugin.getQueue(sessionId, playerId)
+        val track = queue.queue.get(index) ?: return
+        queue.queue.add(position, track)
+    }
+
+    @GetMapping("/v4/sessions/{sessionId}/players/{playerId}/history")
+    fun getHistory(@PathVariable sessionId: String, @PathVariable playerId: Long): Tracks {
+        return Tracks(lavaQueuePlugin.getQueue(sessionId, playerId).history.get().map {
+            it.toTrack(
+                playerManager,
+                pluginInfoModifiers
+            )
+        })
+    }
+
+    @GetMapping("/v4/sessions/{sessionId}/players/{playerId}/history/{index}")
+    fun getHistoryIndex(
+        @PathVariable sessionId: String,
+        @PathVariable playerId: Long,
+        @PathVariable index: Int
+    ): Track? {
+        return lavaQueuePlugin.getQueue(sessionId, playerId).history.get(index)
+            ?.toTrack(playerManager, pluginInfoModifiers)
+    }
+
+}
\ No newline at end of file
diff --git a/main/src/main/kotlin/com/github/topi314/lavaqueue/util.kt b/main/src/main/kotlin/com/github/topi314/lavaqueue/util.kt
new file mode 100644
index 0000000..855b45f
--- /dev/null
+++ b/main/src/main/kotlin/com/github/topi314/lavaqueue/util.kt
@@ -0,0 +1,28 @@
+package com.github.topi314.lavaqueue
+
+import com.github.topi314.lavaqueue.protocol.EncodedTrack
+import com.github.topi314.lavaqueue.protocol.EncodedTracks
+import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack
+import dev.arbjerg.lavalink.api.AudioPluginInfoModifier
+import lavalink.server.util.decodeTrack
+import lavalink.server.util.toTrack
+import com.github.topi314.lavaqueue.protocol.Queue as PQueue
+
+fun Queue.toQueue(
+    audioPlayerManager: AudioPlayerManager,
+    pluginInfoModifiers: List<AudioPluginInfoModifier>
+): PQueue {
+    return PQueue(
+        type,
+        queue.get().map { it.toTrack(audioPlayerManager, pluginInfoModifiers) },
+    )
+}
+
+fun EncodedTrack.toAudioTrack(audioPlayerManager: AudioPlayerManager): AudioTrack {
+    return decodeTrack(audioPlayerManager, this.track)
+}
+
+fun EncodedTracks.toAudioTracks(audioPlayerManager: AudioPlayerManager): List<AudioTrack> {
+    return this.tracks.map { it.toAudioTrack(audioPlayerManager) }
+}
\ No newline at end of file
diff --git a/protocol/build.gradle.kts b/protocol/build.gradle.kts
new file mode 100644
index 0000000..03917a2
--- /dev/null
+++ b/protocol/build.gradle.kts
@@ -0,0 +1,41 @@
+plugins {
+    `java-library`
+    kotlin("multiplatform")
+    kotlin("plugin.serialization")
+}
+
+base {
+    archivesName = "lavaqueue-protocol"
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+}
+
+kotlin {
+    jvm {
+        compilations.all {
+            kotlinOptions.jvmTarget = "17"
+        }
+    }
+    js(IR) {
+        nodejs()
+    }
+
+    publishing {
+        publications {
+            withType<MavenPublication> {
+                artifactId = "lavaqueue-$artifactId"
+            }
+        }
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation(libs.kotlinx.serialization)
+                implementation(libs.lavalink.protocol)
+            }
+        }
+    }
+}
diff --git a/protocol/src/commonMain/kotlin/com/github/topi314/lavaqueue/protocol/messages.kt b/protocol/src/commonMain/kotlin/com/github/topi314/lavaqueue/protocol/messages.kt
new file mode 100644
index 0000000..0963be7
--- /dev/null
+++ b/protocol/src/commonMain/kotlin/com/github/topi314/lavaqueue/protocol/messages.kt
@@ -0,0 +1,14 @@
+package com.github.topi314.lavaqueue.protocol
+
+import dev.arbjerg.lavalink.protocol.v4.Message
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@SerialName("ready")
+@Serializable
+data class QueueEndEvent(
+    val guildId: String
+) {
+    val op: Message.Op = Message.Op.Event
+    val type: String = "QueueEndEvent"
+}
\ No newline at end of file
diff --git a/protocol/src/commonMain/kotlin/com/github/topi314/lavaqueue/protocol/queue.kt b/protocol/src/commonMain/kotlin/com/github/topi314/lavaqueue/protocol/queue.kt
new file mode 100644
index 0000000..b4b6095
--- /dev/null
+++ b/protocol/src/commonMain/kotlin/com/github/topi314/lavaqueue/protocol/queue.kt
@@ -0,0 +1,45 @@
+package com.github.topi314.lavaqueue.protocol
+
+import dev.arbjerg.lavalink.protocol.v4.Omissible
+import dev.arbjerg.lavalink.protocol.v4.Track
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlin.jvm.JvmInline
+
+@Serializable
+data class Queue(
+    val type: Type,
+    val tracks: List<Track>,
+) {
+    @Serializable
+    enum class Type {
+        @SerialName("normal")
+        NORMAL,
+
+        @SerialName("repeat_track")
+        REPEAT_TRACK,
+
+        @SerialName("repeat_queue")
+        REPEAT_QUEUE,
+    }
+}
+
+@Serializable
+data class QueueCreate(
+    val type: Queue.Type,
+    val tracks: EncodedTracks,
+)
+
+@Serializable
+data class QueueUpdate(
+    val type: Omissible<Queue.Type>,
+    val tracks: Omissible<EncodedTracks>,
+)
+
+@Serializable
+@JvmInline
+value class EncodedTrack(val track: String)
+
+@Serializable
+@JvmInline
+value class EncodedTracks(val tracks: List<EncodedTrack>)
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..ca2e14b
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,25 @@
+rootProject.name = "LavaQueue"
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+include(":main")
+include(":protocol")
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            version("lavalink", "4.0.6")
+            version("lavaplayer", "2.2.0")
+
+            library("lavalink-protocol", "dev.arbjerg.lavalink", "protocol").versionRef("lavalink")
+            library("lavalink-server", "dev.arbjerg.lavalink", "Lavalink-Server").versionRef("lavalink")
+
+            library("lavaplayer", "dev.arbjerg", "lavaplayer").versionRef("lavaplayer")
+
+            plugin("lavalink", "dev.arbjerg.lavalink.gradle-plugin").version("1.0.14")
+
+            library("annotations", "org.jetbrains", "annotations").version("24.0.1")
+            library("kotlin-annotations", "org.jetbrains.kotlin", "kotlin-annotations-jvm").version("1.9.0")
+            library("kotlinx-serialization", "org.jetbrains.kotlinx", "kotlinx-serialization-json").version("1.5.1")
+        }
+    }
+}