diff --git a/.jshintrc b/.jshintrc
index 741c370..4a25373 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -18,6 +18,7 @@
     "trailing": true,
     "smarttabs": true,
     "jquery": true,
+    "sub": true,
     "predef": [
         // Third-Party
         "_",
diff --git a/.travis.yml b/.travis.yml
index 244b7e8..8975f45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,8 @@
 language: node_js
 node_js:
   - '0.10'
+before_install: 
+- gem update --system
+- gem install sass --version '=3.2.12'
+- gem install compass --version '=0.12.2'
+- npm install -g grunt-cli
diff --git a/Gruntfile.js b/Gruntfile.js
index ef0ea9b..5aed490 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -137,9 +137,6 @@ module.exports = function (grunt) {
             }
         },
 
-
-
-
         // Compiles Sass to CSS and generates necessary files if requested
         compass: {
             options: {
@@ -187,7 +184,8 @@ module.exports = function (grunt) {
         'bower-install': {
             app: {
                 html: '<%= yeoman.app %>/index.html',
-                ignorePath: '<%= yeoman.app %>/'
+                ignorePath: '<%= yeoman.app %>/',
+                exclude: ['<%= yeoman.app %>/bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap.js']
             }
         },
 
@@ -198,7 +196,7 @@ module.exports = function (grunt) {
                     src: [
                         '<%= yeoman.dist %>/scripts/{,*/}*.js',
                         '<%= yeoman.dist %>/styles/{,*/}*.css',
-                        '<%= yeoman.dist %>/images/{,*/}*.{gif,jpeg,jpg,png,webp}',
+                        '<%= yeoman.dist %>/images/{,*/}*',
                         '<%= yeoman.dist %>/styles/fonts/{,*/}*.*'
                     ]
                 }
@@ -218,7 +216,7 @@ module.exports = function (grunt) {
         // Performs rewrites based on rev and the useminPrepare configuration
         usemin: {
             options: {
-                assetsDirs: ['<%= yeoman.dist %>']
+                assetsDirs: ['<%= yeoman.dist %>', '<%= yeoman.dist %>/images']
             },
             html: ['<%= yeoman.dist %>/{,*/}*.html'],
             css: ['<%= yeoman.dist %>/styles/{,*/}*.css']
@@ -303,10 +301,10 @@ module.exports = function (grunt) {
                     src: [
                         '*.{ico,png,txt}',
                         '.htaccess',
-                        'images/{,*/}*.webp',
+                        'images/{,*/}*',
                         '{,*/}*.html',
                         'styles/fonts/{,*/}*.*',
-                        'bower_components/' + (this.includeCompass ? 'sass-' : '') + 'bootstrap/' + (this.includeCompass ? 'fonts/' : 'dist/fonts/') +'*.*'
+                        'bower_components/bootstrap/vendor/assets/fonts/bootstrap/fonts/*.*'
                     ]
                 }]
             },
diff --git a/app/index.html b/app/index.html
index 3174488..e70ceed 100644
--- a/app/index.html
+++ b/app/index.html
@@ -13,12 +13,13 @@
         <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
         <!-- build:css styles/vendor.css -->
         <!-- bower:css -->
-
         <!-- endbower -->
         <!-- endbuild -->
+        
         <!-- build:css(.tmp) styles/main.css -->
-        <link rel="stylesheet" href="styles/main.css">
+            <link rel="stylesheet" href="styles/main.css">
         <!-- endbuild -->
+        
         <script src="bower_components/modernizr/modernizr.js"></script>
 
     </head>
@@ -44,6 +45,14 @@ <h1>TasteMusic</h1>
                 <p><a class="btn btn-lg btn-success" href="https://github.com/tastejs/TasteMusic/issues/1" target="_blank">Share Your Music</a></p>
             </div>
 
+            <a href="https://soundcloud.com/tfr-royal/of-monsters-and-men-dirty-paws" title="Play Track" class="track">Play Track</a> 
+
+
+            <div class="sm2-container">
+                <div class="ui360">
+                </div>
+            </div>
+
             <div class="row marketing">
                 <h3>List of Tracks</h3>
                 <div class="col-md-12" id="shared-links">
@@ -60,9 +69,13 @@ <h3>List of Tracks</h3>
 
         <!-- build:js scripts/vendor.js -->
         <!-- bower:js -->
-        <script src="bower_components/jquery/jquery.js"></script>
-        <script src="bower_components/underscore/underscore.js"></script>
+        <script src="bower_components/jquery/dist/jquery.js"></script>
+        <script src="bower_components/lodash/dist/lodash.min.js"></script>
+        <script src="bower_components/get-urls/get-urls.js"></script>
+        <script src="bower_components/soundmanager/script/soundmanager2-nodebug-jsmin.js"></script>
+        <script src="bower_components/soundmanager/demo/mp3-player-button/script/mp3-player-button.js"></script>
         <!-- endbower -->
+        <script src="http://connect.soundcloud.com/sdk.js"></script>
         <!-- endbuild -->
 
         <!-- Google Analytics: change UA-XXXXX-X to be your site's ID. -->
@@ -76,23 +89,24 @@ <h3>List of Tracks</h3>
         </script>
 
         <!-- build:js scripts/plugins.js -->
-        <script src="bower_components/sass-bootstrap/js/affix.js"></script>
-        <script src="bower_components/sass-bootstrap/js/alert.js"></script>
-        <script src="bower_components/sass-bootstrap/js/dropdown.js"></script>
-        <script src="bower_components/sass-bootstrap/js/tooltip.js"></script>
-        <script src="bower_components/sass-bootstrap/js/modal.js"></script>
-        <script src="bower_components/sass-bootstrap/js/transition.js"></script>
-        <script src="bower_components/sass-bootstrap/js/button.js"></script>
-        <script src="bower_components/sass-bootstrap/js/popover.js"></script>
-        <script src="bower_components/sass-bootstrap/js/carousel.js"></script>
-        <script src="bower_components/sass-bootstrap/js/scrollspy.js"></script>
-        <script src="bower_components/sass-bootstrap/js/collapse.js"></script>
-        <script src="bower_components/sass-bootstrap/js/tab.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/affix.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/alert.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/dropdown.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/tooltip.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/modal.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/transition.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/button.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/popover.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/carousel.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/scrollspy.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/collapse.js"></script>
+        <script src="bower_components/bootstrap-sass/vendor/assets/javascripts/bootstrap/tab.js"></script>
         <!-- endbuild -->
 
         <!-- build:js({app,.tmp}) scripts/main.js -->
         <script src="scripts/helpers.js"></script>
         <script src="scripts/comments_parser.js"></script>
+        <script src="scripts/player.js"></script>
         <script src="scripts/main.js"></script>
         <!-- endbuild -->
 </body>
diff --git a/app/scripts/comments_parser.js b/app/scripts/comments_parser.js
index 55e40af..d901909 100644
--- a/app/scripts/comments_parser.js
+++ b/app/scripts/comments_parser.js
@@ -1,6 +1,9 @@
+/*jslint indent: false, global app: true */
 ;(function(_, window, undefined) {
   'use strict';
 
+  var app = window.app;
+
   // The result object after we're done parsing the URLs.
   var result = {
     htmlList: document.createElement('ol'),
@@ -16,8 +19,8 @@
 
 
   // Returns true if a URL matches any of the provided domain names.
-  var domainMatch = function(url, domains) {
-    var r = false, url = url.toLowerCase();
+  var domainMatch = function(URL, domains) {
+    var r = false, url = URL.toLowerCase();
 
     if (_.isString(domains)) {
       return url.indexOf(domains) > 1 ? true : false;
@@ -30,13 +33,13 @@
     });
    
     return r;
-  }
+  };
 
 
   var item; // Creates a list-item with a link for each URL.
   function buildList(url) {
     item = document.createElement('li');
-    item.innerHTML = '<a href="'+url+'" target="_blank">' + url + '</a>';
+    item.innerHTML = '<a href="'+url+'" target="_blank" class="track">' + url + '</a>';
     result.htmlList.appendChild(item);
   }
 
@@ -90,7 +93,7 @@
       }
 
       // Send ajax
-      app.http.get({
+      new app.http.get({
         url: endpoint,
 
         success: function(data, status, statusText) {
@@ -100,28 +103,30 @@
             if (self.comments.length > 0) {
               self.build();
             } else {
-              self.options.fail('No more links are available.');
+              self.options.fail('No more links are available. '+statusText);
             }
           }
         },
 
         error: function(xhr, status, statusText) {
+            self.comments = [];
+            self.build();
           self.options.fail(status + ' ' + statusText);
         }
       });
     },
 
     // Collect URLs from a single chunk of string
-    collectUrls: function(string_chunk) {
-      var string_lines = [];
+    collectUrls: function(stringChunk) {
+      var stringLines = [];
       var words = [];
       var URLs = [];
 
       // Split on new lines
-      string_lines = string_chunk.split(app.regex.newline);
+      stringLines = stringChunk.split(app.regex.newline);
 
       // Get words out of each line
-      _.each(_.compact(string_lines), function(line) {
+      _.each(_.compact(stringLines), function(line) {
         words.push(line.split(app.regex.space));
       });
 
@@ -140,25 +145,25 @@
 
     build: function() {
       var self = this;
-      var comment_urls;
+      var commentUrls;
       var currentLength = 0;
       var commentsLength = self.comments.length;
 
       // Collect urls from comment's body
       _.each(self.comments, function(comment) {
-        comment_urls = self.collectUrls(comment['body']);
+        commentUrls = self.collectUrls(comment['body']);
 
         // Simply concat them to the result array
-        result.array = result.array.concat(comment_urls);
+        result.array = result.array.concat(commentUrls);
 
         // Each URL in the comment is added to a  
         // collection type in the result object
-        _.each(comment_urls, addToCollections);
+        _.each(commentUrls, addToCollections);
 
         currentLength += 1;
 
         // Are we done?
-        if (currentLength == commentsLength) {
+        if (currentLength === commentsLength) {
           self.complete();
           return;
         }
diff --git a/app/scripts/helpers.js b/app/scripts/helpers.js
index 19d0b76..43e4a10 100644
--- a/app/scripts/helpers.js
+++ b/app/scripts/helpers.js
@@ -1,3 +1,5 @@
+/*jslint indent: false  */
+
 ;(function(_, window, undefined) {
   'use strict';
 
@@ -11,46 +13,46 @@
 
 
   // Regex: https://gist.github.com/dperini/729294
-  var re_weburl = new RegExp(
-    "^" +
+  var reWebUrl = new RegExp(
+    '^' +
       // protocol identifier
-      "(?:(?:https?|ftp)://)" +
+      '(?:(?:https?|ftp)://)' +
       // user:pass authentication
-      "(?:\\S+(?::\\S*)?@)?" +
-      "(?:" +
+      '(?:\\S+(?::\\S*)?@)?' +
+      '(?:' +
         // IP address exclusion
         // private & local networks
-        "(?!10(?:\\.\\d{1,3}){3})" +
-        "(?!127(?:\\.\\d{1,3}){3})" +
-        "(?!169\\.254(?:\\.\\d{1,3}){2})" +
-        "(?!192\\.168(?:\\.\\d{1,3}){2})" +
-        "(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})" +
+        '(?!10(?:\\.\\d{1,3}){3})' +
+        '(?!127(?:\\.\\d{1,3}){3})' +
+        '(?!169\\.254(?:\\.\\d{1,3}){2})' +
+        '(?!192\\.168(?:\\.\\d{1,3}){2})' +
+        '(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})' +
         // IP address dotted notation octets
         // excludes loopback network 0.0.0.0
         // excludes reserved space >= 224.0.0.0
         // excludes network & broacast addresses
         // (first & last IP address of each class)
-        "(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])" +
-        "(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}" +
-        "(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))" +
-      "|" +
+        '(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])' +
+        '(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}' +
+        '(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))' +
+      '|' +
         // host name
-        "(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)" +
+        '(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)' +
         // domain name
-        "(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*" +
+        '(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*' +
         // TLD identifier
-        "(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))" +
-      ")" +
+        '(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))' +
+      ')' +
       // port number
-      "(?::\\d{2,5})?" +
+      '(?::\\d{2,5})?' +
       // resource path
-      "(?:/[^\\s]*)?" +
-    "$", "i"
-  );  
+      '(?:/[^\\s]*)?' +
+    '$', 'i'
+  );
 
 
   // Ajax methods
-  var http = app.http = {
+  window.app.http = {
     // [CORS]: 
     // The request will succeed if the Browser supports 
     // XHR2/CORS because GitHub also allows CORS requests.
@@ -58,14 +60,13 @@
       var xhr;
 
       // Bypass cache by adding timestamp at the end of the url.
-      var url = options.url + ((/\?/).test(options.url) ? "&" : "?") + (+(new Date));
+      var url = options.url + ((/\?/).test(options.url) ? '&' : '?') + (+(new Date()));
 
       // Only modern Browsers!
       if (window.XMLHttpRequest) {
         xhr = new XMLHttpRequest();
       } else {
-        throw new Error("Your browser doesn't support the XMLHttpRequest object!");
-        return;
+        throw new Error('Your browser doesn\'t support the XMLHttpRequest object!');
       }
 
       // Set handler to process server's response
@@ -86,9 +87,9 @@
 
 
   // Regular expressions
-  var regex = app.regex = {
+  window.app.regex = {
     newline: /\r\n/,
     space: /\s/,
-    weburl: re_weburl
+    weburl: reWebUrl
   };
 }(_, window));
\ No newline at end of file
diff --git a/app/scripts/main.js b/app/scripts/main.js
index 19ad354..ec7b041 100644
--- a/app/scripts/main.js
+++ b/app/scripts/main.js
@@ -1,21 +1,19 @@
+/*jslint indent: false, global app: false */
 ;(function(_, window, undefined) {
   'use strict';
 
-  var output = document.getElementById('shared-links');
 
-  new app.CommentsParser({
-    url: 'https://api.github.com/repos/tastejs/TasteMusic/issues/1/comments',
-    done: parseDone,
-    fail: parseFail
-  }).parse();
+  var output = document.getElementById('shared-links');
 
 
   // The sharedLinks are available here.
   function parseDone(result) {
     if (result && _.isObject(result)) {
       output.innerHTML = result.htmlList.outerHTML;
-
       console.log(result);
+
+      window.app.Player.updatePlaylist();
+
     }
   }
 
@@ -24,4 +22,11 @@
       output.innerHTML = errMessage;
     }
   }
+  
+  new window.app.CommentsParser({
+    url: 'https://api.github.com/repos/tastejs/TasteMusic/issues/1/comments',
+    done: parseDone,
+    fail: parseFail
+  }).parse();
+
 }(_, window));
\ No newline at end of file
diff --git a/app/scripts/player.js b/app/scripts/player.js
new file mode 100644
index 0000000..4aedabc
--- /dev/null
+++ b/app/scripts/player.js
@@ -0,0 +1,85 @@
+/*jslint global soundManager: true, global SC: true */
+'use strict';
+(function(_, window, soundManager, SC, undefined) {
+    
+    var app = window.app;
+    var $ = window.jQuery;
+    var clientId = '6aeb01b043ebc13df5e211ab3187464f';
+
+    var sounds = [];
+    
+    SC.initialize({
+        /*jslint camelcase: false */
+        client_id: clientId
+        //, redirect_uri: "http://example.com/callback.html",
+    });
+    
+    // Helpers
+    var resolve = function(url, callback) {
+        /*jslint camelcase: false */
+        SC.get('/resolve.json', { url: url }, callback);
+    };
+    
+    function Player() {
+
+    }
+
+    Player.playTrack = function(track, callback) {
+        var self = this;
+        var url = track.url;
+        resolve(url, function(track) {
+            console.log(track);
+            SC.stream('/tracks/'+track.id, function(sound) {
+                self.stopAllSounds();
+                sounds.push(sound);
+                sound.play();
+                return callback && callback();
+            });
+        });
+    };
+
+    Player.stopAllSounds = function() {
+        for (var i=0, len=sounds.length; i<len; i++)
+        {
+            sounds[i].stop();
+        }
+    };
+
+    /*
+    soundManager.setup({
+        url: '/path/to/swf-files/',
+        flashVersion: 9, // optional: shiny features (default = 8)
+        // optional: ignore Flash where possible, use 100% HTML5 mode
+        // preferFlash: false,
+        onready: function() {
+            // Ready to use; soundManager.createSound() etc. can now be called.
+        }
+    });
+    */
+
+    Player.updatePlaylist = function() {
+        $('.track').click(function(event) {
+            console.log(event, this);
+            event.preventDefault();
+
+            var $el = $(this);
+            var url = $el.attr('href');
+            var track = {
+                url: url
+            };
+
+            Player.playTrack(track, function() {
+                console.log('Playing '+url);
+            });
+
+            return false;
+        });
+    };
+
+    app.Player = Player;
+
+    $(document).ready(function() {
+        app.Player.updatePlaylist();
+    });
+
+})(_, window, window.soundManager, window.SC);
\ No newline at end of file
diff --git a/app/styles/main.scss b/app/styles/main.scss
index edb5b01..71ea762 100644
--- a/app/styles/main.scss
+++ b/app/styles/main.scss
@@ -1,6 +1,6 @@
-$icon-font-path: "/bower_components/sass-bootstrap/fonts/";
+$icon-font-path: "/bower_components/bootstrap-sass/vendor/assets/fonts/";
 
-@import 'sass-bootstrap/lib/bootstrap';
+@import 'bootstrap-sass/vendor/assets/stylesheets/bootstrap';
 
 .browsehappy {
     margin: 0.2em 0;
diff --git a/bower.json b/bower.json
index 892d1af..d76fddc 100644
--- a/bower.json
+++ b/bower.json
@@ -2,10 +2,15 @@
   "name": "tastemusic",
   "private": true,
   "dependencies": {
-    "sass-bootstrap": "~3.0.0",
+    "bootstrap-sass": "git://github.com/twbs/bootstrap-sass.git#v3.1.1",
     "modernizr": "~2.6.2",
-    "jquery": "~1.10.2",
-    "underscore": "1.6.0"
+    "jquery": "~2.1.0",
+    "lodash": "2.4.1",
+    "get-urls": "0.1.1",
+    "soundmanager": "V2.97a.20131201"
   },
-  "devDependencies": {}
+  "devDependencies": {
+    "chai": "*",
+    "mocha": "*"
+  }
 }
diff --git a/package.json b/package.json
index da500d6..a34367c 100644
--- a/package.json
+++ b/package.json
@@ -12,10 +12,17 @@
         "name": "Glavin Wiechert",
         "email": "glavin.wiechert@gmail.com",
         "url": "https://github.com/Glavin001"
+    },
+    {
+        "name": "Sindre Sorhus",
+        "email": "sindresorhus@gmail.com",
+        "url": "https://github.com/sindresorhus"
     }
   ],
   "dependencies": {},
   "devDependencies": {
+    "bower": "~1.2.8",
+    "mocha": "~1.17.1",
     "grunt": "~0.4.1",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-concat": "~0.3.0",
@@ -27,7 +34,7 @@
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-htmlmin": "~0.1.3",
     "grunt-bower-install": "~0.7.0",
-    "grunt-contrib-imagemin": "~0.2.0",
+    "grunt-contrib-imagemin": "~0.5.0",
     "grunt-contrib-watch": "~0.5.2",
     "grunt-rev": "~0.1.0",
     "grunt-autoprefixer": "~0.5.0",
@@ -39,9 +46,14 @@
     "grunt-concurrent": "~0.4.0",
     "load-grunt-tasks": "~0.2.0",
     "time-grunt": "~0.2.0",
-    "jshint-stylish": "~0.1.3"
+    "jshint-stylish": "~0.1.3",
+    "grunt-contrib-requirejs": "~0.4.1"
   },
   "engines": {
     "node": ">=0.8.0"
+  },
+  "scripts": {
+    "test": "bower install && grunt",
+    "start": "grunt serve"
   }
 }