diff --git a/README.md b/README.md
index afc8e3c..2c42b49 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@
 https://fund.saturn.kim/
 
 # Featuring:
+- [Listening Parties (Clubs)](https://clubs.saturn.kim)
 - FLAC & MP3 320 support
 - BYO Last.fm Integration (Safer solution!)
 - Discord Listen Together & RPC
diff --git a/app/client/package.json b/app/client/package.json
index 00ce9a8..a1447ad 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "client",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/app/client/src/App.vue b/app/client/src/App.vue
index 408ba6a..d156242 100644
--- a/app/client/src/App.vue
+++ b/app/client/src/App.vue
@@ -144,6 +144,14 @@
           <v-list-item-title>{{$t('About')}}</v-list-item-title>
         </v-list-item>
 
+        <!-- Rooms -->
+        <v-list-item link to='/rooms' v-if='isUp()'>
+          <v-list-item-icon>
+            <v-icon>mdi-earth</v-icon>
+          </v-list-item-icon>
+          <v-list-item-title>Clubs</v-list-item-title>
+        </v-list-item>
+
       </v-list>
     </v-navigation-drawer>
 
@@ -227,6 +235,7 @@
 
         <!-- Controls -->
         <v-col class='text-center' cols='12' sm='auto'>
+          <div v-if='$rooms.allowControls()'>
             <v-btn icon large @click.stop='$root.skip(-1)'>
                 <v-icon>mdi-skip-previous</v-icon>
             </v-btn>
@@ -237,6 +246,7 @@
             <v-btn icon large @click.stop='$root.skipNext'>
                 <v-icon>mdi-skip-next</v-icon>
             </v-btn>
+          </div>
         </v-col>
 
 
@@ -346,6 +356,7 @@
 
 <script>
 import FullscreenPlayer from '@/views/FullscreenPlayer.vue';
+import axios from 'axios';
 
 export default {
   name: 'App',
@@ -375,6 +386,15 @@ export default {
       if (this.showPlayer) this.showPlayer = false;
       this.volume = this.$root.volume;
     },
+    async isUp() { // do not show button if site is down because consistency
+      await axios.get('https://clubs.saturn.kim/a')
+      .catch(function (error) {
+        if (error.response) {
+          if (error.response.status == 404) { return true; } // index doesnt exist so this actually makes sense
+          else { return false; }
+        }
+      });
+    },
     //Navigation
     previous() {
       if (window.history.length == 3) return;
@@ -440,6 +460,7 @@ export default {
       }
     },
     seek(val) {
+      if (!this.$rooms.allowControls()) return;
       this.$root.seek(Math.round((val / 100) * this.$root.duration()));
     },
     async exitApp() {
diff --git a/app/client/src/components/AlbumContext.vue b/app/client/src/components/AlbumContext.vue
index 1d83f8f..e66f8dd 100644
--- a/app/client/src/components/AlbumContext.vue
+++ b/app/client/src/components/AlbumContext.vue
@@ -1,7 +1,7 @@
 <template>
 <v-list dense>
     <!-- Play album -->
-    <v-list-item dense @click='$emit("play")'>
+    <v-list-item dense @click='$emit("play")' v-if='!$rooms.room'>
         <v-list-item-icon>
             <v-icon>mdi-play</v-icon>
         </v-list-item-icon>
@@ -10,7 +10,7 @@
         </v-list-item-content>
     </v-list-item>
     <!-- Add to queue -->
-    <v-list-item dense @click='$emit("addQueue")'>
+    <v-list-item dense @click='$emit("addQueue")' v-if='!$rooms.room'>
         <v-list-item-icon>
             <v-icon>mdi-playlist-plus</v-icon>
         </v-list-item-icon>
diff --git a/app/client/src/components/AlbumTile.vue b/app/client/src/components/AlbumTile.vue
index 223124f..69846b2 100644
--- a/app/client/src/components/AlbumTile.vue
+++ b/app/client/src/components/AlbumTile.vue
@@ -120,6 +120,9 @@ export default {
             });
         },
         async play() {
+            //Rooms
+            if (!this.$rooms.allowControls()) return;
+
             let album = this.album;
             //Load album from API if tracks are missing
             if (album.tracks.length == 0) {
@@ -139,6 +142,9 @@ export default {
         },
         //Add to queue
         async addQueue() {
+            //Rooms
+            if (!this.$rooms.allowControls()) return;
+
             let album = this.album;
             //Load album from API if tracks are missing
             if (album.tracks.length == 0) {
diff --git a/app/client/src/components/LibraryHistory.vue b/app/client/src/components/LibraryHistory.vue
index 1e8fbb4..778b6d0 100644
--- a/app/client/src/components/LibraryHistory.vue
+++ b/app/client/src/components/LibraryHistory.vue
@@ -55,6 +55,9 @@ export default {
         },
         //Load as queue and play
         play(index) {
+            //Rooms
+            if (this.$rooms.room) return;
+
             this.$root.queue.source = {
                 text: this.$t('History'),
                 source: 'history',
diff --git a/app/client/src/components/LibraryTracks.vue b/app/client/src/components/LibraryTracks.vue
index 8719836..318d437 100644
--- a/app/client/src/components/LibraryTracks.vue
+++ b/app/client/src/components/LibraryTracks.vue
@@ -107,6 +107,9 @@ export default {
         },
         //Play track
         async play(id) {
+            //Rooms
+            if (this.$rooms.room) return;
+
             this.$root.queue.source = {
                 text: 'Loved tracks',
                 source: 'playlist',
diff --git a/app/client/src/components/Lyrics.vue b/app/client/src/components/Lyrics.vue
index 4552e09..2f09c89 100644
--- a/app/client/src/components/Lyrics.vue
+++ b/app/client/src/components/Lyrics.vue
@@ -104,6 +104,9 @@ export default {
         },
         //Seek to lyric in song
         seekTo(i) {
+            //Rooms
+            if (!this.$rooms.allowControls()) return;
+
             this.$root.seek(this.lyrics.lyrics[i].offset);
         }
     },
diff --git a/app/client/src/components/PlaylistTile.vue b/app/client/src/components/PlaylistTile.vue
index 4f6f987..10bfe95 100644
--- a/app/client/src/components/PlaylistTile.vue
+++ b/app/client/src/components/PlaylistTile.vue
@@ -27,7 +27,7 @@
                 </template>
                 <v-list dense>
                     <!-- Play -->
-                    <v-list-item dense @click='play'>
+                    <v-list-item dense @click='play' v-if='!$rooms.room'>
                         <v-list-item-icon>
                             <v-icon>mdi-play</v-icon>
                         </v-list-item-icon>
@@ -134,6 +134,8 @@ export default {
     },
     methods: {
         async play() {
+            if (this.$rooms.room) return;
+
             let playlist = this.playlist;
             //Load if no tracks
             if (!playlist || playlist.tracks.length == 0)
diff --git a/app/client/src/components/SmartTrackList.vue b/app/client/src/components/SmartTrackList.vue
index 9bdf471..95c2b08 100644
--- a/app/client/src/components/SmartTrackList.vue
+++ b/app/client/src/components/SmartTrackList.vue
@@ -27,6 +27,10 @@ export default {
     methods: {
         //Load stt as source
         async play() {
+            //Rooms
+            if (this.$rooms.room) return;
+
+
             this.loading = true;
             
             //Load data
diff --git a/app/client/src/components/TrackTile.vue b/app/client/src/components/TrackTile.vue
index 03afe80..0e71e53 100644
--- a/app/client/src/components/TrackTile.vue
+++ b/app/client/src/components/TrackTile.vue
@@ -44,7 +44,7 @@
             </template>
             <v-list dense>
                 <!-- Play Next -->
-                <v-list-item dense @click='playNext'>
+                <v-list-item dense @click='playNext' v-if='$rooms.allowControls()'>
                     <v-list-item-icon>
                         <v-icon>mdi-playlist-plus</v-icon>
                     </v-list-item-icon>
@@ -53,7 +53,7 @@
                     </v-list-item-content>
                 </v-list-item>
                 <!-- Add to end of queue -->
-                <v-list-item dense @click='addQueue'>
+                <v-list-item dense @click='addQueue' v-if='$rooms.allowControls()'>
                     <v-list-item-icon>
                         <v-icon>mdi-playlist-plus</v-icon>
                     </v-list-item-icon>
@@ -61,6 +61,15 @@
                         <v-list-item-title>{{$t("Add to queue")}}</v-list-item-title>
                     </v-list-item-content>
                 </v-list-item>
+                <!-- Request song (Rooms) -->
+                <v-list-item dense @click='$rooms.request(track)' v-if='$rooms.room && !$rooms.allowControls()'>
+                    <v-list-item-icon>
+                        <v-icon>mdi-playlist-plus</v-icon>
+                    </v-list-item-icon>
+                    <v-list-item-content>
+                        <v-list-item-title>Request song in room</v-list-item-title>
+                    </v-list-item-content>
+                </v-list-item>
                 <!-- Add to library -->
                 <v-list-item dense @click='addLibrary' v-if='!isLibrary'>
                     <v-list-item-icon>
@@ -107,7 +116,7 @@
                     </v-list-item-content>
                 </v-list-item>
                 <!-- Play track mix -->
-                <v-list-item dense @click='trackMix'>
+                <v-list-item dense @click='trackMix' v-if='!$rooms.room'>
                     <v-list-item-icon>
                         <v-icon>mdi-playlist-music</v-icon>
                     </v-list-item-icon>
@@ -199,9 +208,19 @@ export default {
     methods: {
         //Add track next to queue
         playNext() {
+            //Rooms
+            if (this.$rooms.allowControls()) {
+                this.$rooms.addQueue(this.track, true);
+                return;
+            }
             this.$root.addTrackIndex(this.track, this.$root.queue.index+1);
         },
         addQueue() {
+            //Rooms
+            if (this.$rooms.allowControls()) {
+                this.$rooms.addQueue(this.track);
+                return;
+            }
             this.$root.queue.data.push(this.track);
         },
         addLibrary() {
diff --git a/app/client/src/js/rooms.js b/app/client/src/js/rooms.js
new file mode 100644
index 0000000..393a0f2
--- /dev/null
+++ b/app/client/src/js/rooms.js
@@ -0,0 +1,458 @@
+import axios from 'axios';
+import ioClient from 'socket.io-client';
+import Vue from 'vue';
+// import md5 from 'md5';
+
+function headers() {
+    return {
+        "Content-Language": "en-US",
+        "Cache-Control": "max-age=0",
+        "Accept": "*/*",
+        "Accept-Language": "en-US,en;q=0.9,en-US;q=0.8,en;q=0.7",
+    }
+}
+
+async function x(id) {
+    try {
+        const response = await axios.get(`https://clubs.saturn.kim/track/${id}`, {
+            headers: headers()
+        });
+
+        return response.data;
+    } catch (error) {
+        console.error('Error fetching data:', error);
+        throw error;
+    }
+}
+
+class Album {
+    constructor(json, tracksJson = {data: []}, library = false) {
+        this.id = json.ALB_ID.toString();
+        this.title = json.ALB_TITLE;
+        this.art = new DeezerImage(json.ALB_PICTURE);
+        this.fans = json.NB_FAN;
+        this.tracks = tracksJson.data.map((t) => new Track(t));
+        this.artists = (json.ARTISTS ? json.ARTISTS : [json]).map((a) => new Artist(a));
+        this.releaseDate = json.DIGITAL_RELEASE_DATE;
+        
+        //Explicit
+        this.explicit = false;
+        if (json.EXPLICIT_LYRICS && json.EXPLICIT_LYRICS.toString() == "1") this.explicit = true;
+        if (json.EXPLICIT_ALBUM_CONTENT) {
+            if (json.EXPLICIT_ALBUM_CONTENT.EXPLICIT_LYRICS_STATUS == 4) this.explicit = true;
+            if (json.EXPLICIT_ALBUM_CONTENT.EXPLICIT_LYRICS_STATUS == 1) this.explicit = true;
+        }
+
+        //Type
+        this.type = 'album';
+        if (json.TYPE && json.TYPE.toString() == "0") this.type = 'single';
+        if (json.ROLE_ID == 5) this.type = 'featured';
+
+        //Helpers
+        this.artistString = this.artists.map((a) => a.name).join(', ');
+
+        this.library = library;
+    }
+}
+
+class DeezerImage {
+    constructor(hash, type='cover') {
+        this.hash = hash;
+        this.type = type;
+        //Create full and thumb, to standardize size and because functions aren't preserved
+        this.full = DeezerImage.url(this.hash, this.type, 1400);
+        this.thumb = DeezerImage.url(this.hash, this.type, 264);
+    }
+    static url(hash, type, size = 264) {
+        if (!hash) {
+            return `https://e-cdns-images.dzcdn.net/images/${type}/${size}x${size}-000000-80-0-0.jpg`;
+        } else {
+            return `https://e-cdns-images.dzcdn.net/images/${type}/${hash}/${size}x${size}-000000-80-0-0.jpg`;
+        }
+    }
+}
+
+class Artist {
+    constructor(json, albumsJson = {data: []}, topJson = {data: []}, library = false) {
+        this.id = json.ART_ID.toString();
+        this.name = json.ART_NAME;
+        this.fans = json.NB_FAN;
+        this.picture = new DeezerImage(json.ART_PICTURE, 'artist');
+        this.albumCount = albumsJson.total;
+        this.albums = albumsJson.data.map((a) => new Album(a));
+        this.topTracks = topJson.data.map((t) => new Track(t));
+        this.radio = json.SMARTRADIO;
+        this.library = library;
+    }
+}
+
+class Track {
+    constructor(json) {
+        this.id = json.SNG_ID.toString();
+        this.title = `${json.SNG_TITLE}${json.VERSION ? ` ${json.VERSION}` : ''}`;
+        //Duration as ms for easier use in frontend
+        this.duration = parseInt(json.DURATION.toString(), 10) * 1000; 
+        this.albumArt = new DeezerImage(json.ALB_PICTURE);
+        this.artists = (json.ARTISTS ? json.ARTISTS : [json]).map((a) => new Artist(a));
+        //Helper
+        this.artistString = this.artists.map((a) => a.name).join(', ');
+
+        this.album = new Album(json);
+        this.trackNumber = parseInt((json.TRACK_NUMBER || 1).toString(), 10);
+        this.diskNumber = parseInt((json.DISK_NUMBER || 1).toString(), 10);
+        this.explicit = json['EXPLICIT_LYRICS'] == 1 ? true:false;
+        this.lyricsId = json.LYRICS_ID;
+
+        this.library = null;
+
+        //Generate URL Part
+        //0 - 32    = MD5 ORIGIN
+        //33 -      = 1/0 if md5origin ends with .mp3
+        //34 - 35   = MediaVersion
+        //Rest      = Track ID
+        let md5 = json.MD5_ORIGIN.replace('.mp3', '');
+        let md5mp3bit = json.MD5_ORIGIN.includes('.mp3') ? '1' : '0';
+        let mv = json.MEDIA_VERSION.toString().padStart(2, '0');
+        this.streamUrl = `${md5}${md5mp3bit}${mv}${this.id}`;
+    }
+}
+
+class Rooms {
+
+    constructor(address) {
+        this.room = null;
+        this.profile = {};
+        this.chat = Vue.observable({
+            messages: []
+        });
+
+        //Setup connections
+        this.axios = axios.create({
+            baseURL: address
+        });
+        this.io = ioClient(address);
+
+        //Error occured
+        this.io.on('error', (msg) => {
+            console.error(msg);
+            this.vue.$root.globalSnackbar = msg;
+            if (this.reject)
+                this.reject();
+        });
+
+        //Joined room
+        this.io.on('join', (room) => {
+            this.room = Vue.observable(room);
+            if (this.resolve)
+                this.resolve();
+        });
+
+        //User joined room
+        this.io.on('joined', (user) => {
+            this.room.users.push(user);
+        });
+
+        //User left
+        this.io.on('left', (user) => {
+            let i = this.room.users.findIndex((u) => u.id.toString() == user.id.toString());
+            if (i != -1) {
+                this.room.users.splice(i, 1);
+            }
+        });
+
+        //Add track to queue
+        this.io.on('addQueue', async (args) => {
+            console.log("addqueue triggered:", args)
+            //Fetch
+            let res = await x(args.track);
+            let track = new Track(res);
+            //Add to queue
+            if (args.next)
+                this.vue.$root.queue.data.splice(this.vue.$root.queue.index+1, 0, track);
+            else 
+                this.vue.$root.queue.data.push(track);
+        });
+
+        //Index change
+        this.io.on('index', async (args) => {
+            //Load track
+            this.vue.$root.queue.index = args.index;
+            this.vue.$root.track = this.vue.$root.queue.data[this.vue.$root.queue.index];
+            await this.vue.$root.playTrack(this.vue.$root.track);
+            //Sync position
+            if (this.room.playing) {
+                this.vue.$root.seek((Date.now() - args.timestamp));
+                //Don't play, just prefetch
+                this.vue.$root.play();
+                setTimeout(() => {
+                    this.vue.$root.pause();
+                }, 50);
+            }
+        });
+
+        //Track request
+        this.io.on('request', async (id) => {
+            console.log("onrequest triggered for track:", id)
+            let ovo = new Track(id.id)
+            this.room.requests.push(ovo);
+        });
+
+        //Track request removed
+        this.io.on('removeRequest', (id) => {
+            console.log("rmrequest triggered for id:", id)
+            let i = this.room.requests.findIndex(t => t.id.toString() == id);
+            if (i != -1)
+                this.room.requests.splice(i, 1);
+        });
+
+        //Sync
+        this.io.on('sync', (args) => {
+            //Pause and seek
+            if (!args.playing) {
+                this.vue.$root.pause();
+                this.vue.$root.seek(args.position, false);
+            } else {
+                //Sync position
+                this.vue.$root.seek(args.position, false);
+                this.vue.$root.play();
+            }
+        });
+
+        //Chat message
+        this.io.on('message', (msg) => {
+            this.chat.messages.push(msg);
+        });
+        
+        // todo
+        // proper implementation
+        this.io.on('ban', () => {
+            this.io.disconnect()
+            window.location.reload();
+        });
+
+        this.io.on('disconnect', () => {
+            window.location.reload();
+        });
+    }
+
+
+    //Vue plugin
+    install(Vue) {
+        Vue.prototype.$rooms = this;
+        //Call this function to set Vue here
+        Vue.prototype.$roomsBind = function () {
+            return {
+                setBind: function () {
+                    this.$rooms.vue = this;
+                }.bind(this)
+            };
+        };
+    }
+
+    leave() {
+        // todo
+        // this sucks
+        this.io.disconnect();
+    }
+
+    //Callback
+    togglePlayback(playing) {
+        if (!this.room) return;
+        this.room.playing = playing;
+        //Send sync signal
+        this.io.emit('sync', {
+            playing: playing,
+            position: this.vue.$root.position,
+            timestamp: Date.now()
+        });
+    }
+
+    //Sync with other clietns
+    sync() {
+        if (!this.room) return;
+        this.io.emit('sync', {
+            playing: this.vue.$root.state == 2,
+            position: this.vue.$root.position,
+            timestamp: Date.now()
+        });
+    }
+
+    //Add to queue, next = add to queue next
+    addQueue(track, next = false) {
+        console.log("addqueue emitted for track:", track + "\n" + track.id.toString() + "\n" + next)
+        if (!this.room || !this.allowControls()) return;
+
+        //Add to queue
+        if (next)
+            this.vue.$root.queue.data.splice(this.vue.$root.queue.index+1, 0, track);
+        else
+            this.vue.$root.queue.data.push(track);
+        //Emit
+        this.io.emit('addQueue', {
+            track: track.id,
+            next: next
+        });
+    }
+
+    async playIndex(i) {
+        if (!this.allowControls()) return;
+        this.io.emit('index', i);
+        //Play
+        this.vue.$root.queue.index = i;
+        this.vue.$root.track = this.vue.$root.queue.data[i];
+        await this.vue.$root.playTrack(this.vue.$root.track);
+        //Sync
+        if (this.room.playing) {
+            await this.vue.$root.play();
+            //Wait for playing
+            while (this.vue.$root.position == 0) {
+                await new Promise((res) => setTimeout(res, 100));
+            }
+            this.sync();
+        }
+    }
+
+    //Ban user
+    ban(id) {
+        this.io.emit('ban', id);
+    }
+
+    //Track end callback
+    async trackEnd() {
+        //End of queue
+        if ((this.vue.$root.queue.data.length - 1) == this.vue.$root.queue.index) {
+            this.togglePlayback(false);
+            return;
+        }
+        if (!this.allowControls()) return;
+        //Next track
+        await this.playIndex(this.vue.$root.queue.index + 1);
+    }
+
+    //Add Deezer profile
+    setProfile(profile) {
+        this.profile = profile;
+    }
+
+    //Check if controlling audio allowed
+    allowControls() {
+        if (!this.room) return true;
+        let user = this.room.users.find(u => u.id == this.profile.id.toString());
+        return user.admin;
+    }
+
+    //Get all rooms
+    async getRooms() {
+        return (await this.axios.get('/rooms')).data;
+    }
+
+    //Create new room
+    async createRoom(title, password) {
+        return (await this.axios.post('/room', {
+            title, 
+            queue: this.vue.$root.queue.data.map(t => t.id.toString()), 
+            queueIndex: this.vue.$root.queue.index,
+            password: password
+        })).data;
+    }
+
+    //Request track to be played
+    async request(track) {
+        let res = await x(track.id);
+        console.log("request emitted for track:", track + "\n" + track.id.toString())
+        console.log(res)
+        this.room.requests.push(new Track(res));
+        this.io.emit('request', {
+            id: res
+        });
+    }
+
+    //Remove request
+    removeRequest(track) {
+        console.log("rmrequest emitted for track:", track + "\n" + track.id.toString())
+        if (!this.allowControls()) return;
+        let i = this.room.requests.findIndex(t => t.id.toString() == track.id);
+        if (i != -1)
+            this.room.requests.splice(i, 1);
+        this.io.emit('removeRequest', track.id.toString());
+    }
+
+    //Join to a room by id
+    async joinRoom(id, password) {
+        this.io.emit('join', {
+            room: id,
+            //Pass session for authentication
+            sid: this.profile.session,
+            id: this.profile.id,
+            name: this.profile.name,
+            photo: this.profile.picture,
+            password: password
+        });
+        //Wait for response
+        try {
+            await new Promise((res, rej) => {
+                this.resolve = res;
+                this.reject = rej;
+            });
+        } catch (e) {return false;}
+
+        //Fetch request queue
+        let tracks = [];
+        for (let id of this.room.requests) {
+            try {
+                let track = await x(id)
+                tracks.push(new Track(track))
+                this.room.requests.push(new Track(track));
+
+            //Doesn't matter if fails
+            } catch (e) {console.log(e);}
+        }
+        this.room.requests = tracks;
+
+        //Setup queue
+        this.vue.$root.queue.index = this.room.queueIndex;
+        this.vue.$root.queue.source = {
+            text: 'Room',
+            source: 'room',
+            data: 'room'
+        };
+
+        //Check if not same queue
+        if (this.vue.$root.queue.data.map(t => t.id.toString()) == this.room.queue)
+            return true;
+
+        console.log(this.vue.$root.queue.data)
+
+        //Fetch tracks
+        tracks = [];
+        for (let id of this.room.queue) {
+            let track = await x(id)
+            tracks.push(new Track(track))
+            // this.room.requests.push(new Track(track));
+        }
+        this.vue.$root.queue.data = tracks;
+
+        console.log(tracks)
+
+        this.vue.$root.track = tracks[this.room.queueIndex];
+
+        //Play
+        await this.vue.$root.playTrack(this.vue.$root.track);
+        //Sync
+        let pos = this.room.position;
+        if (this.room.playing)
+            pos += (Date.now() - this.room.positionTime)
+        await this.vue.$root.seek(pos, false); 
+        if (this.room.playing)
+            await this.vue.$root.play();
+
+        return true;
+    }
+
+    //Send message to chat
+    sendMessage(content, profile = this.profile.name, photo = this.profile.picture.full) {
+        this.io.emit('message', {content, profile, photo});
+    }
+}
+
+export {Rooms};
\ No newline at end of file
diff --git a/app/client/src/js/router.js b/app/client/src/js/router.js
index a611383..c9e52e6 100644
--- a/app/client/src/js/router.js
+++ b/app/client/src/js/router.js
@@ -12,6 +12,7 @@ import Settings from '@/views/Settings.vue';
 import DeezerPage from '@/views/DeezerPage.vue';
 import DownloadsPage from '@/views/DownloadsPage.vue';
 import About from '@/views/About.vue';
+import Rooms from '@/views/Rooms.vue';
 
 Vue.use(VueRouter);
 
@@ -80,6 +81,10 @@ const routes = [
         path: '/about',
         component: About
     },
+    {
+        path: '/rooms',
+        component: Rooms
+    }
 ];
 
 const router = new VueRouter({
diff --git a/app/client/src/main.js b/app/client/src/main.js
index 831e202..0282b04 100644
--- a/app/client/src/main.js
+++ b/app/client/src/main.js
@@ -6,6 +6,7 @@ import axios from 'axios';
 import VueEsc from 'vue-esc';
 import i18n from './js/i18n';
 import { io } from "socket.io-client";
+import {Rooms} from './js/rooms';
 
 //Globals
 let ipcRenderer;
@@ -56,6 +57,9 @@ Vue.prototype.$io = io("http://localhost:10069", {
     path: '/socket'
 });
 
+//Rooms
+Vue.use(new Rooms('https://clubs.saturn.kim'));
+
 Vue.config.productionTip = false;
 Vue.use(VueEsc);
 
@@ -120,23 +124,28 @@ new Vue({
         play() {
             if (!this.audio || this.state != 1) return;
             this.audio.play();
+            this.$rooms.togglePlayback(true);
             this.state = 2;
         },
         pause() {
             if (!this.audio || this.state != 2) return;
             this.audio.pause();
+            this.$rooms.togglePlayback(false);
             this.state = 1;
         },
         toggle() {
             if (this.isPlaying()) return this.pause();
             this.play();
         },
-        seek(t) {
+        seek(t, room = true) {
             if (!this.audio || isNaN(t) || !t) return;
             //ms -> s
             this.audio.currentTime = (t / 1000);
             this.position = t;
 
+            if (room)
+                this.$rooms.sync();
+
             this.updateState();
         },
 
@@ -159,6 +168,13 @@ new Vue({
         //Play at index in queue
         async playIndex(index) {
             if (index >= this.queue.data.length || index < 0) return;
+
+            //Rooms
+            if (this.$rooms.room) {
+                this.$rooms.playIndex(index);
+                return;
+            }
+
             this.queue.index = index;
             await this.playTrack(this.queue.data[this.queue.index]);
             this.play();
@@ -166,6 +182,7 @@ new Vue({
         },
         //Skip n tracks, can be negative
         async skip(n) {
+            this.pause()
             let newIndex = this.queue.index + n;
             //Out of bounds
             if (newIndex < 0 || newIndex >= this.queue.data.length) return;
@@ -247,8 +264,9 @@ new Vue({
             //MediaSession
             this.updateMediaSession();
             
-            //Loads more tracks if end of list
-            this.loadSTL();
+            //Loads more tracks if end of list, if not in room
+            if (!this.$rooms.room)
+                this.loadSTL();
         },
         //Configure html audio element
         configureAudio() {
@@ -256,6 +274,9 @@ new Vue({
             this.audio.addEventListener('timeupdate', async () => {
                 this.position = this.audio.currentTime * 1000;
 
+                //Rooms
+                if (this.$rooms.room) return;
+
                 //Gapless playback
                 if (this.position >= (this.duration() - (this.settings.crossfadeDuration + 7500)) && this.state == 2) {
                     if (this.repeat != 2)
@@ -310,6 +331,13 @@ new Vue({
             this.audio.volume = this.volume * this.volume;
             
             this.audio.addEventListener('ended', async () => {
+                //Track end
+                if (this.$rooms.room) {
+                    this.$rooms.trackEnd();
+                    return;
+                }
+
+
                 if (this.gapless.crossfade) return;
 
                 //Repeat track
@@ -596,12 +624,21 @@ new Vue({
 
             //Control from electron
             ipcRenderer.on('togglePlayback', () => {
+                //Rooms
+                if (!this.$rooms.allowControls()) return;
+
                 this.toggle();
             });
             ipcRenderer.on('skipNext', () => {
+                //Rooms
+                if (!this.$rooms.allowControls()) return;
+
                 this.skip(1);
             });
             ipcRenderer.on('skipPrev', () => {
+                //Rooms
+                if (!this.$rooms.allowControls()) return;
+
                 this.skip(-1);
             })
         }
@@ -630,6 +667,8 @@ new Vue({
     },
 
     mounted() {
+        //Bind rooms
+        this.$roomsBind().setBind();
         //Save settings on unload
         window.addEventListener('beforeunload', () => {
             this.savePlaybackInfo();
@@ -648,6 +687,9 @@ new Vue({
             //Don't handle if specials
             if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) return;
 
+            //Rooms
+            if (!this.$rooms.allowControls()) return;
+
             //K toggle playback
             if (e.code == "KeyK" || e.code == "Space") this.$root.toggle();
             //L +10s (from YT)
@@ -681,6 +723,9 @@ new Vue({
         state() {
             this.updateMediaSession();
             this.updateState();
+            //Rooms
+            if (this.$rooms.room && this.$rooms.allowControls())
+                this.$rooms.sync();
         },
         //Update volume with curve
         volume() {
diff --git a/app/client/src/views/AlbumPage.vue b/app/client/src/views/AlbumPage.vue
index 6dcc72f..8b6329f 100644
--- a/app/client/src/views/AlbumPage.vue
+++ b/app/client/src/views/AlbumPage.vue
@@ -27,7 +27,7 @@
             </div>
             
             <div class='my-2'>
-                <v-btn color='primary' class='mx-1' @click='play'>
+                <v-btn color='primary' class='mx-1' @click='play' v-if='!$rooms.room'>
                     <v-icon left>mdi-play</v-icon>
                     {{$t("Play")}}
                 </v-btn>
@@ -94,6 +94,8 @@ export default {
     methods: {
         //Load album and play at index
         playTrack(index) {
+            //Rooms
+            if (this.$rooms.room) return;
             this.$root.queue.source = {
                 text: this.album.title,
                 source: 'album',
diff --git a/app/client/src/views/ArtistPage.vue b/app/client/src/views/ArtistPage.vue
index 8e045fc..ac7de96 100644
--- a/app/client/src/views/ArtistPage.vue
+++ b/app/client/src/views/ArtistPage.vue
@@ -21,7 +21,7 @@
             </div>
             
             <div class='my-2'>
-                <v-btn color='primary' class='mx-1' @click='play'>
+                <v-btn color='primary' class='mx-1' @click='play' v-if='!$rooms.room'>
                     <v-icon left>mdi-play</v-icon>
                     {{$t("Play top")}}
                 </v-btn>
@@ -36,7 +36,7 @@
                     </div>
                     
                 </v-btn>
-                <v-btn color='green' class='mx-1' @click='radio' v-if='artist.radio'>
+                <v-btn color='green' class='mx-1' @click='radio' v-if='artist.radio && $rooms.allowControls()'>
                     <v-icon left>mdi-radio</v-icon>
                     {{$t("Radio")}}
                 </v-btn>
@@ -143,6 +143,8 @@ export default {
     },
     methods: {
         playIndex(index) {
+            //Rooms
+            if (this.$rooms.room) return;
             this.$root.queue.source = {
                 text: this.artist.name,
                 source: 'top',
@@ -204,6 +206,8 @@ export default {
             this.loadMoreAlbums();
         },
         async radio() {
+            //Rooms
+            if (!this.$rooms.allowControls()) return;
             //Load
             let res = await this.$axios.get('/smartradio/' + this.artist.id);
             if (res.data) {
diff --git a/app/client/src/views/FullscreenPlayer.vue b/app/client/src/views/FullscreenPlayer.vue
index 97483d0..bbb2df8 100644
--- a/app/client/src/views/FullscreenPlayer.vue
+++ b/app/client/src/views/FullscreenPlayer.vue
@@ -49,7 +49,7 @@
                 </v-row>
 
                 <!-- Controls -->
-                <v-row no-gutters class='ma-4'>
+                <v-row no-gutters class='ma-4' v-if='$rooms.allowControls()'>
                     <v-col>
                         <v-btn icon x-large @click='$root.skip(-1)'>
                             <v-icon size='42px'>mdi-skip-previous</v-icon>
@@ -69,16 +69,20 @@
                         </v-btn>
                     </v-col>
                 </v-row>
+                <!-- Rooms -->
+                <v-row no-gutters class='ma-4' v-if='!$rooms.allowControls()'>
+                    <div style='height: 50px;'></div>
+                </v-row>
 
                 <!-- Bottom actions -->
                 <div class='d-flex mx-2 mb-2'>
                     
-                    <v-btn icon @click='repeatClick'>
+                    <v-btn icon @click='repeatClick' v-if='!$rooms.room'>
                         <v-icon v-if='$root.repeat == 0 || !$root.repeat'>mdi-repeat</v-icon>
                         <v-icon color='primary' v-if='$root.repeat == 1'>mdi-repeat</v-icon>
                         <v-icon color='primary' v-if='$root.repeat == 2'>mdi-repeat-once</v-icon>
                     </v-btn>
-                    <v-btn icon @click='$root.shuffle()'>
+                    <v-btn icon @click='$root.shuffle()' v-if='!$rooms.room'>
                         <v-icon color='primary' v-if='$root.shuffled'>mdi-shuffle</v-icon>
                         <v-icon v-if='!$root.shuffled'>mdi-shuffle</v-icon>
                     </v-btn>
@@ -277,11 +281,23 @@ export default {
             this.$emit('close');
         },
         seek(v) {
+            //Rooms
+            if (!this.$rooms.allowControls()) {
+                this.seeking = false;
+                return;
+            }
+
             this.$root.seek(v * 1000);
             this.seeking = false;
         },
         //Mouse event seek
         seekEvent(v) {
+            //Rooms
+            if (!this.$rooms.allowControls()) {
+                this.seeking = false;
+                return;
+            }
+
             let seeker = this.$refs.seeker;
             let offsetp = (v.pageX - seeker.$el.offsetLeft) / seeker.$el.clientWidth;
             let pos = offsetp * this.$root.duration();
diff --git a/app/client/src/views/Library.vue b/app/client/src/views/Library.vue
index a5dc267..0a9fdc6 100644
--- a/app/client/src/views/Library.vue
+++ b/app/client/src/views/Library.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
     <h1>{{$t("Library")}} 
-        <v-btn class='ml-2 mb-1' icon @click='shuffle'>
+        <v-btn class='ml-2 mb-1' icon @click='shuffle' v-if='$rooms.allowControls()'>
             <v-icon>mdi-shuffle</v-icon>
         </v-btn>
     </h1>
@@ -81,6 +81,10 @@ export default {
     },
     methods: {
         async shuffle() {
+            //Rooms
+            if (this.$rooms.room) return;
+
+
             let res = await this.$axios.get('/shuffle');
             if (res && res.data) {
                 this.$root.queue.source = {
diff --git a/app/client/src/views/Login.vue b/app/client/src/views/Login.vue
index 2c7924f..86f2ba4 100644
--- a/app/client/src/views/Login.vue
+++ b/app/client/src/views/Login.vue
@@ -84,6 +84,10 @@ export default {
                 //Load profile
                 let res = await this.$axios.get('/profile');
                 this.$root.profile = res.data;
+
+                //Auth rooms
+                this.$rooms.setProfile(this.$root.profile);
+
                 this.$router.push('/home');
                 //Cache library
                 this.$root.cacheLibrary();
diff --git a/app/client/src/views/PlaylistPage.vue b/app/client/src/views/PlaylistPage.vue
index f211033..c6da347 100644
--- a/app/client/src/views/PlaylistPage.vue
+++ b/app/client/src/views/PlaylistPage.vue
@@ -28,7 +28,7 @@
             </div>
             
             <div class='my-2 d-flex'>
-                <v-btn color='primary' class='mr-1' @click='play'>
+                <v-btn color='primary' class='mr-1' @click='play' v-if='!$rooms.room'>
                     <v-icon left>mdi-play</v-icon>
                     {{$t('Play')}}
                 </v-btn>
@@ -150,6 +150,8 @@ export default {
     },
     methods: {
         async playIndex(index) {
+            //Rooms
+            if (this.$rooms.room) return;
             //Load tracks
             if (this.playlist.tracks.length == 0)
                 await this.loadAllTracks();
diff --git a/app/client/src/views/Rooms.vue b/app/client/src/views/Rooms.vue
new file mode 100644
index 0000000..f34cd5e
--- /dev/null
+++ b/app/client/src/views/Rooms.vue
@@ -0,0 +1,334 @@
+<template>
+    <div>
+        <div v-if='!$rooms.room'>
+        <h1 style="display: flex; align-items: center; position: relative">
+        <div style="display: flex; align-items: center">
+          Clubs
+          <v-btn class="ml-2 mb-1" icon @click="loadRooms()">
+            <v-icon>mdi-refresh</v-icon>
+          </v-btn>
+        </div>
+        <v-btn
+          @click="createDialog = true"
+          color="primary"
+          class="my-4"
+          style="position: absolute; right: 0"
+        >
+          <v-icon left>mdi-plus</v-icon>
+          Create new club
+        </v-btn>
+      </h1>
+    
+            <!-- List of rooms -->
+            <v-list>
+                <div v-if='!rooms' class='ma-auto text-center'>
+                    <v-progress-circular indeterminate></v-progress-circular>
+                </div>
+                <v-list-item v-for='room in rooms' :key='room.id' @click='joinRoom(room)'>
+                    <v-list-item-icon>
+                        <v-icon v-if='room.password'>mdi-lock</v-icon>
+                        <v-icon v-if='!room.password'>mdi-earth</v-icon>
+                    </v-list-item-icon>
+                    <v-list-item-content>
+                        <v-list-item-title>{{room.title}}</v-list-item-title>
+                        <v-list-item-subtitle>
+                            <v-icon class='mr-2'>mdi-account-multiple</v-icon>{{room.users}}
+                        </v-list-item-subtitle>
+                    </v-list-item-content>
+                </v-list-item>
+            </v-list>
+        </div>
+    
+        <!-- Joined room -->
+        <div v-if='$rooms.room'>
+            <v-container>
+                <v-row no-gutters>
+                    <!-- Left side -->
+                    <v-col cols='6' class='px-2'>
+                        <h2 class='text-center mb-2'>{{$rooms.room.title}}</h2>
+                        <v-btn icon class='leave-button text-center' @click='leave()' color='red'>
+                            <v-icon>mdi-close</v-icon>
+                        </v-btn>
+                        <!-- User list -->
+                        <h3 class='text-center mb-2'>Listeners ({{$rooms.room.users.length}}):</h3>
+                        <div>
+                            <v-list dense class='overflow-y-auto' style='max-height: calc(50vh - 160px); height: calc(50vh - 160px);'>
+                                <v-list-item dense v-for='user in $rooms.room.users' :key='"user" + user.sid'>
+                                    <v-list-item-avatar>
+                                        <v-img :src='user.picture' width='32' contain></v-img>
+                                    </v-list-item-avatar>
+                                    <v-list-item-content>
+                                        <v-list-item-title v-if='user.admin' style='color: #F44336;'>{{user.username}}</v-list-item-title>
+                                        <v-list-item-title v-if='!user.admin'>{{user.username}}</v-list-item-title>
+                                    </v-list-item-content>
+                                    <v-list-item-action>
+                                        <div v-if='!user.admin && $rooms.allowControls()'>
+                                            <v-icon @click='ban(user.sid)'>mdi-close</v-icon>
+                                        </div>
+                                    </v-list-item-action>
+                                </v-list-item>
+                            </v-list>
+                        </div>
+    
+                        <!-- Requested songs -->
+                        <h3 class='text-center my-2'>Song requests:</h3>
+                        <div>
+                            <v-list dense class='overflow-y-auto' style='max-height: calc(50vh - 156px); height: calc(50vh - 156px);'>
+                                <v-list-item dense v-for='track in $rooms.room.requests' :key='"req" + track.id'>
+                                    <v-list-item-avatar>
+                                        <v-img :src='track.albumArt.thumb'></v-img>
+                                    </v-list-item-avatar>
+                                    <v-list-item-content>
+                                        <v-list-item-title>{{track.title}}</v-list-item-title>
+                                        <v-list-item-subtitle>{{track.artistString}}</v-list-item-subtitle>
+                                    </v-list-item-content>
+                                    <v-list-item-action v-if='$rooms.allowControls()'>
+                                        <div class='d-flex'>
+                                            <v-btn icon @click='$rooms.removeRequest(track)'>
+                                                <v-icon>mdi-close</v-icon>
+                                            </v-btn>
+                                            <v-btn icon @click='playRequestNext(track)'>
+                                                <v-icon>mdi-playlist-play</v-icon>
+                                            </v-btn>
+                                            <v-btn icon @click='addRequestQueue(track)'>
+                                                <v-icon>mdi-playlist-plus</v-icon>
+                                            </v-btn>
+                                        </div>
+                                    </v-list-item-action>
+                                </v-list-item>
+                            </v-list>
+                        </div>
+                    </v-col>
+                    <!-- Right side -->
+                    <v-col cols='6' class='px-2'>
+                        <div>
+                            <v-list dense class='overflow-y-auto' style='max-height: calc(100vh - 270px); height: calc(100vh - 270px)' ref='chat'>
+                                <v-list-item dense v-for='message in $rooms.chat.messages' :key='message.timestamp'>
+                                    <v-list-item-avatar>
+                                        <v-img :src='message.photo' width='32' contain></v-img>
+                                    </v-list-item-avatar>
+                                    <v-list-item-content>
+                                        <!-- todo - red name on admin in chat ? -->
+                                        <!-- <v-list-item-title v-if='user(message.user).admin' style='color: #F44336;'>{{user(message.user).username}}</v-list-item-title>
+                                        <v-list-item-title v-if='!user(message.user).admin'>{{user(message.user).username}}</v-list-item-title> -->
+                                        <v-list-item-title>{{ message.profile }}</v-list-item-title>
+                                        <v-list-item-subtitle>{{message.content}}</v-list-item-subtitle>
+                                    </v-list-item-content>
+                                </v-list-item>
+                            </v-list>
+                        </div>
+                        <!-- Send message -->
+                        <v-text-field 
+                            dense
+                            hide-details
+                            filled
+                            maxlength='150'
+                            class='mt-6'
+                            label='Send message'
+                            @keyup.enter='sendMessage'
+                            v-model='message'
+                            :disabled='disabledChat'
+                            ref='chatField'
+                        ></v-text-field>
+                    </v-col>
+                </v-row>
+            </v-container>
+        </div>
+    
+    
+        <!-- Password dialog -->
+        <v-dialog v-model='passwordDialog' width='400'>
+            <v-card>
+                <v-card-title>Club is password protected</v-card-title>
+                <v-text-field 
+                    class='my-1 mx-4' 
+                    label='Password' 
+                    v-model='joinPassword'
+                    type="password"
+                ></v-text-field>
+                <v-card-actions>
+                    <v-spacer></v-spacer>
+                    <v-btn
+                        color='primary'
+                        class='my-2'
+                        @click='joinWithPassword()'
+                    >Join</v-btn>
+                </v-card-actions>
+            </v-card>
+        </v-dialog>
+    
+        <!-- Loading -->
+        <v-overlay v-if='loading' class='text-center'>
+            <v-progress-circular indeterminate></v-progress-circular>
+            <br>
+            <span class='text-h6'>Downloading queue...</span>
+        </v-overlay>
+    
+        <!-- Create room dialog -->
+        <v-dialog v-model='createDialog' width='400'>
+            <v-card>
+                <v-card-title>Create Club</v-card-title>
+                <v-text-field class='mx-4 my-1' label='Name' v-model='roomName'>
+                    <v-icon>mdi-label</v-icon>
+                </v-text-field>
+                <v-text-field class='mx-4 my-1' label='Password' v-model='roomPassword' type="password">
+                    <v-icon>mdi-lock</v-icon>
+                </v-text-field>
+                <v-card-actions>
+                    <v-spacer></v-spacer>
+                    <v-btn 
+                        color='primary' 
+                        class='my-2' 
+                        @click='createRoom'
+                        :disabled='!roomName || roomName.length < 3 || !roomPassword || roomPassword.length < 3'
+                        :loading='creatingRoom'
+                        maxlength='32'
+                    >Create</v-btn>
+                </v-card-actions>
+            </v-card>
+        </v-dialog>
+    
+        <TrackTile v-if='false'></TrackTile>
+    
+    </div>
+    </template>
+    
+    <style>
+    .leave-button {
+        position: absolute;
+        left: 48px;
+        top: 32px;
+    }
+    </style>
+    
+    <script>
+    // import md5 from 'md5';
+    
+    import TrackTile from '../components/TrackTile';
+    
+    export default {
+        name: 'Rooms',
+        components: {TrackTile},
+        data() {
+            return {
+                rooms: null,
+                loading: false,
+    
+                //Chat
+                message: null,
+                disabledChat: false,
+    
+                //Join room
+                joinPassword: null,
+                passwordDialog: false,
+                joinRoomId: null,
+    
+                //Create dialog
+                createDialog: false,
+                roomName: null,
+                roomPassword: null,
+                creatingRoom: false
+            }
+        },
+        methods: {
+            //Load list of rooms
+            async loadRooms() {
+                let rooms = await this.$rooms.getRooms();
+                rooms.sort((a, b) => b.users - a.users);
+                this.rooms = rooms;
+            },
+            //Create new room
+            async createRoom() {
+                this.$root.pause();
+    
+                this.creatingRoom = true;
+                //Generate queue
+                let {id, password} = await this.$rooms.createRoom(this.roomName, this.roomPassword);
+                this.creatingRoom = false;
+                this.createDialog = false;
+                //Join
+                if (!password) {
+                    await this.joinWithPassword(id, password);
+                    return;
+                }
+                await this.joinWithPassword(id, password);
+            },
+            //Join to room
+            async joinRoom(room) {
+                //Check password
+                if (room.password) {
+                    this.joinRoomId = room.id;
+                    this.joinPassword = null;
+                    this.passwordDialog = true;
+                    return;
+                }
+                //Join
+                this.loading = true;
+                await this.$rooms.joinRoom(room.id);
+                this.loading = false;
+            },
+            //Join to room with password
+            async joinWithPassword(id, password) {
+
+                this.passwordDialog = false;
+                this.loading = true;
+                if (!id)
+                    id = this.joinRoomId;
+                if (!password)
+                    password = this.joinPassword;
+                await this.$rooms.joinRoom(id, password);
+    
+                this.joinPassword = null;
+                this.loading = false;
+            },
+            //Send chat message
+            sendMessage() {
+                if (!this.message || this.message.length < 1) return;
+                this.$rooms.sendMessage(this.message);
+                this.message = null;
+                //Rate limt
+                this.disabledChat = true;
+                setTimeout(() => {
+                    this.disabledChat = false;
+                    setTimeout(() => {
+                        this.$refs.chatField.focus();
+                    }, 50);
+                }, 250);
+            },
+            //Get user by id
+            user(id) {
+                return this.$rooms.room.users.find(u => u.id == id);
+            },
+            //Ban user
+            ban(user) {
+                this.$rooms.ban(user);
+            },
+            //Play request
+            async playRequestNext(track) {
+                if (!this.$rooms.allowControls()) return;
+                this.$rooms.removeRequest(track);
+                await this.$rooms.addQueue(track, true);
+            },
+            async addRequestQueue(track) {
+                if (!this.$rooms.allowControls()) return;
+                this.$rooms.removeRequest(track);
+                await this.$rooms.addQueue(track, false);
+            },
+            // dc from ws (crappy)
+            leave() {
+                this.$rooms.leave();
+                window.location.reload();
+            }
+        },
+        mounted() {
+            this.loadRooms();
+        },
+        watch: {
+            '$rooms.chat.messages'() {
+                setTimeout(() => {
+                    this.$refs.chat.$el.scrollBy(0, 1000);
+                }, 50);
+            }
+        }
+    }
+    </script>
\ No newline at end of file
diff --git a/app/client/src/views/Search.vue b/app/client/src/views/Search.vue
index ecc67c3..e1976cd 100644
--- a/app/client/src/views/Search.vue
+++ b/app/client/src/views/Search.vue
@@ -129,6 +129,9 @@ export default {
     },
     //On click for track tile
     playTrack(i) {
+      //Rooms
+      if (this.$rooms.room) return;
+
       this.$root.queue.source = {
         text: this.$t("Search"),
         source: "search",
diff --git a/app/package.json b/app/package.json
index 767e264..6d3110d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "saturn",
   "private": true,
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "",
   "main": "background.js",
   "scripts": {
@@ -11,6 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "arg": "^5.0.0",
+    "md5": "^2.3.0",
     "axios": "^0.21.1",
     "browser-id3-writer": "^4.4.0",
     "chalk": "^4.1.1",
diff --git a/app/src/server.js b/app/src/server.js
index 18453dd..fdf72fc 100644
--- a/app/src/server.js
+++ b/app/src/server.js
@@ -23,7 +23,7 @@ let sockets = [];
 const app = express();
 app.use(express.json({limit: '50mb'}));
 app.use(express.static(path.join(__dirname, '../client', 'dist')));
-app.use(cors({origin: 'http://localhost:8080'}));
+app.use(cors({origin: 'http://127.0.0.1:10069'}));
 //Server
 const server = require('http').createServer(app);
 const { Server } = require('socket.io');
@@ -31,7 +31,7 @@ const io = new Server(server, {
     path: '/socket',
     //CORS for webpack debug
     cors: {
-        origin: 'http://localhost:8080',
+        origin: 'http://127.0.0.1:10069',
         methods: ["GET", "POST"],
     }
 });
diff --git a/package.json b/package.json
index cbb3e99..7da830a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "saturn",
   "private": true,
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "Saturn PC",
   "scripts": {
     "pack": "electron-builder --dir",