diff --git a/src/renderer/layouts/ActionBar.vue b/src/renderer/layouts/ActionBar.vue
index 54cbceb..79fd128 100644
--- a/src/renderer/layouts/ActionBar.vue
+++ b/src/renderer/layouts/ActionBar.vue
@@ -33,7 +33,7 @@ export default {
 }
 </script>
 
-<style lang="sass" scoped>
+<style lang="sass">
 section.action-bar
   display: flex
   align-items: center
diff --git a/src/renderer/layouts/PlayerBar.vue b/src/renderer/layouts/PlayerBar.vue
index 7ab7cd3..02e9c88 100644
--- a/src/renderer/layouts/PlayerBar.vue
+++ b/src/renderer/layouts/PlayerBar.vue
@@ -1,10 +1,10 @@
 <template>
       <section>
         <section class="player">
-          <img @load="onArtworkLoad" class="artwork" :src="currentlyPlaying.artwork" />
+          <img @load="onArtworkLoad" class="artwork" :src="playerQueue[this.currentlyPlaying].artwork" />
           <div>
-              <p class="title">{{currentlyPlaying.title}}</p>
-              <p class="artist">{{currentlyPlaying.artist}}</p>
+              <p class="title">{{playerQueue[this.currentlyPlaying].title}}</p>
+              <p class="artist">{{playerQueue[this.currentlyPlaying].artist}}</p>
           </div>
           <div class="visualizer">
               <div id="visualizer"></div>
@@ -61,7 +61,7 @@ export default {
       isFullscreen: false
     }
   },
-  computed: mapGetters(['fullscreenStatus', 'currentlyPlaying']),
+  computed: mapGetters(['fullscreenStatus', 'currentlyPlaying', 'playerQueue']),
   mounted () {
     let progress = this.$el.getElementsByClassName('progress')[0]
     this.wavesurfer = WaveSurfer.create({
@@ -90,7 +90,7 @@ export default {
         })
       ]
     })
-    this.wavesurfer.load(this.currentlyPlaying.stream)
+    this.wavesurfer.load(this.playerQueue[this.currentlyPlaying].stream)
     this.wavesurfer.on('ready', () => {
       this.duration = formatSeconds(this.getDuration())
       this.wavesurfer.container.style['height'] = '100%'
diff --git a/src/renderer/store/modules/Player.js b/src/renderer/store/modules/Player.js
index d62b80f..0215ad3 100644
--- a/src/renderer/store/modules/Player.js
+++ b/src/renderer/store/modules/Player.js
@@ -1,28 +1,38 @@
 const state = {
   fullscreen_mode: false,
-  currently_playing: {
-    id: 8,
-    title: 'Yellow',
-    artist: 'Rich Brian',
-    artwork: '/static/demo/yellow.jpeg',
-    stream: '/static/demo/music.mp3'
-  }
+  currently_playing: 0,
+  queue: [
+    {
+      id: 8,
+      title: 'Yellow',
+      artist: 'Rich Brian',
+      artwork: '/static/demo/yellow.jpeg',
+      stream: '/static/demo/music.mp3'
+    }
+  ]
 }
 
 const getters = {
   fullscreenStatus: (state) => state.fullscreen_mode,
-  currentlyPlaying: (state) => state.currently_playing
+  currentlyPlaying: (state) => state.currently_playing,
+  playerQueue: (state) => state.queue
 }
 
 const mutations = {
   TOGGLE_FULLSCREEN (state) {
     state.fullscreen_mode = !state.fullscreen_mode
+  },
+  PLAY_QUEUE_ITEM (state, index) {
+    state.currently_playing = index
   }
 }
 
 const actions = {
   toggleFullscreenStatus ({ commit }) {
     commit('TOGGLE_FULLSCREEN')
+  },
+  playQueueItem ({ commit }, index) {
+    commit('PLAY_QUEUE_ITEM', index)
   }
 }