--- a/cms/app-client/app/controllers/application.js	Tue Jan 19 19:06:17 2016 +0100
+++ b/cms/app-client/app/controllers/application.js	Wed Jan 20 00:15:46 2016 +0100
@@ -30,7 +30,7 @@
     }
     if (date.length > 0) {
       var temp = sounds;
-      sounds.map(function(elt, index){
+      sounds.map(function(elt){
         if (date.indexOf(elt.get('created')) === -1){
           temp = temp.without(elt);
         }
@@ -44,28 +44,38 @@
   }),
   actions: {
     deleteTag: function(query, item){
-      var queryParams = {};
+      var queryParams = {},
+          newParams = null;
       if (query === 'date'){
-        var array = this.get('date');
-        if(array.indexOf(item) !== -1) {
-        	array.splice(array.indexOf(item), 1);
+        newParams = this.get('date');
+        if(newParams.indexOf(item) !== -1) {
+        	newParams = newParams.splice(newParams.indexOf(item), 1);
         }
       }
-      queryParams[query] = array || null;
+      queryParams[query] = newParams;
       this.transitionToRoute({queryParams: queryParams});
     },
-    previous: function(){
-      console.log("previous");
+    changeSong: function(songDirection){
+      var direction = (songDirection === "next") ? 1 : -1;
+      var index = this.get("filteredSounds").indexOf(this.get("currentItem"));
+      if ( index !== -1){
+          if (typeof(this.get("filteredSounds").objectAt(index+direction)) !== 'undefined'){
+            return this.set('currentItem', this.get("filteredSounds").objectAt(index+direction));
+          }
+      }
+      return this.set('currentItem', this.get('filteredSounds').get('firstObject'));
     },
-    next: function(){
-      console.log("next");
+    play: function(item){
+      this.set("currentItem", item);
+      Ember.$(".result-item").toggleClass("playing", false);
+      Ember.$("#"+item.id).toggleClass("playing", true);
     },
     details: function(item){
-      if ($("#"+item.id).hasClass("details")){
-          $("#"+item.id).toggleClass("details", false);
+      if (Ember.$("#"+item.id).hasClass("details")){
+          Ember.$("#"+item.id).toggleClass("details", false);
       } else{
-        $(".result-item").toggleClass("details", false);
-        $("#"+item.id).toggleClass("details", true);
+        Ember.$(".result-item").toggleClass("details", false);
+        Ember.$("#"+item.id).toggleClass("details", true);
       }
     },
     toggleModal: function(item){