diff --git a/assets/scripts/app/controllers/sidebar.coffee b/assets/scripts/app/controllers/sidebar.coffee
index fedd6448..8dd299ae 100644
--- a/assets/scripts/app/controllers/sidebar.coffee
+++ b/assets/scripts/app/controllers/sidebar.coffee
@@ -66,3 +66,22 @@ Travis.reopen
     end: ->
       @start() + @get('perPage')
 
+Travis.DecksController = Travis.SponsorsController.extend
+  needs: ['sidebar']
+  perPage: 1
+
+  init: ->
+    @_super.apply this, arguments
+
+    @get('controllers.sidebar').tickables.push(this)
+    @set 'content', Travis.Sponsor.decks()
+
+Travis.LinksController = Travis.SponsorsController.extend
+  needs: ['sidebar']
+  perPage: 6
+
+  init: ->
+    @_super.apply this, arguments
+
+    @get('controllers.sidebar').tickables.push(this)
+    @set 'content', Travis.Sponsor.links()
diff --git a/assets/scripts/app/models/sponsor.coffee b/assets/scripts/app/models/sponsor.coffee
index 82b9564b..201173fb 100644
--- a/assets/scripts/app/models/sponsor.coffee
+++ b/assets/scripts/app/models/sponsor.coffee
@@ -4,10 +4,11 @@ require 'travis/model'
   type:  DS.attr('string')
   url:   DS.attr('string')
   link:  DS.attr('string')
+  _image: DS.attr('string')
 
   image: (->
-    "/images/sponsors/#{@get('data.image')}"
-  ).property('data.image')
+    "/images/sponsors/#{@get('_image')}"
+  ).property('_image')
 
 Travis.Sponsor.reopenClass
   decks: ->
diff --git a/assets/scripts/app/store/rest_adapter.coffee b/assets/scripts/app/store/rest_adapter.coffee
index 9c9f5cc1..54352ee5 100644
--- a/assets/scripts/app/store/rest_adapter.coffee
+++ b/assets/scripts/app/store/rest_adapter.coffee
@@ -66,3 +66,7 @@ Travis.RestAdapter.map 'Travis.Job', {
 Travis.RestAdapter.map 'Travis.User', {
   _name: { key: 'name' }
 }
+
+Travis.RestAdapter.map 'Travis.Sponsor', {
+  _image: { key: 'image' }
+}
diff --git a/assets/scripts/app/views/sidebar.coffee b/assets/scripts/app/views/sidebar.coffee
index 2285c657..12d1a1ea 100644
--- a/assets/scripts/app/views/sidebar.coffee
+++ b/assets/scripts/app/views/sidebar.coffee
@@ -4,28 +4,15 @@
 
     DecksView: Em.View.extend
       templateName: "sponsors/decks"
-      controller: Travis.SponsorsController.create
-        perPage: 1
-
-      didInsertElement: ->
-        controller = @get 'controller'
-        # TODO: move this stuff to controller
-        #unless controller.get('content')
-          #Travis.app.get('router.sidebarController').tickables.push(controller)
-          #controller.set 'content', Travis.Sponsor.decks()
+      init: ->
         @_super.apply this, arguments
+        @set 'controller', @get('controller').container.lookup('controller:decks')
 
     LinksView: Em.View.extend
       templateName: "sponsors/links"
-      controller: Travis.SponsorsController.create
-        perPage: 6
-
-      didInsertElement: ->
-        controller = @get 'controller'
-        #unless controller.get('content')
-        #  controller.set 'content', Travis.Sponsor.links()
-        #  Travis.app.get('router.sidebarController').tickables.push(controller)
+      init: ->
         @_super.apply this, arguments
+        @set 'controller', @get('controller').container.lookup('controller:links')
 
     WorkersView: Em.View.extend
       templateName: 'workers/list'
diff --git a/assets/scripts/data/sponsors.coffee b/assets/scripts/data/sponsors.coffee
index 032a3e86..b8148a36 100644
--- a/assets/scripts/data/sponsors.coffee
+++ b/assets/scripts/data/sponsors.coffee
@@ -1,48 +1,48 @@
 @Travis.SPONSORS = [
-  { type: 'platinum', url: "http://www.wooga.com", image: "wooga-205x130.png" }
-  { type: 'platinum', url: "http://bendyworks.com", image: "bendyworks-205x130.png" }
-  { type: 'platinum', url: "http://cloudcontrol.com", image: "cloudcontrol-205x130.png" }
-  { type: 'platinum', url: "http://xing.de", image: "xing-205x130.png" }
+  { id: '1', type: 'platinum', url: "http://www.wooga.com", image: "wooga-205x130.png" }
+  { id: '2', type: 'platinum', url: "http://bendyworks.com", image: "bendyworks-205x130.png" }
+  { id: '3', type: 'platinum', url: "http://cloudcontrol.com", image: "cloudcontrol-205x130.png" }
+  { id: '4', type: 'platinum', url: "http://xing.de", image: "xing-205x130.png" }
 
-  { type: 'gold', url: "http://heroku.com", image: "heroku-205x60.png" }
-  { type: 'gold', url: "http://soundcloud.com", image: "soundcloud-205x60.png" }
-  { type: 'gold', url: "http://nedap.com", image: "nedap-205x60.png" }
-  { type: 'gold', url: "http://mongohq.com", image: "mongohq-205x60.png" }
-  { type: 'gold', url: "http://zweitag.de", image: "zweitag-205x60.png" }
-  { type: 'gold', url: "http://kanbanery.com", image: "kanbanery-205x60.png" }
-  { type: 'gold', url: "http://ticketevolution.com", image: "ticketevolution-205x60.jpg" }
-  { type: 'gold', url: "http://plan.io/travis", image: "planio-205x60.png" }
+  { id: '5', type: 'gold', url: "http://heroku.com", image: "heroku-205x60.png" }
+  { id: '6', type: 'gold', url: "http://soundcloud.com", image: "soundcloud-205x60.png" }
+  { id: '7', type: 'gold', url: "http://nedap.com", image: "nedap-205x60.png" }
+  { id: '8', type: 'gold', url: "http://mongohq.com", image: "mongohq-205x60.png" }
+  { id: '9', type: 'gold', url: "http://zweitag.de", image: "zweitag-205x60.png" }
+  { id: '10', type: 'gold', url: "http://kanbanery.com", image: "kanbanery-205x60.png" }
+  { id: '11', type: 'gold', url: "http://ticketevolution.com", image: "ticketevolution-205x60.jpg" }
+  { id: '12', type: 'gold', url: "http://plan.io/travis", image: "planio-205x60.png" }
 
-  { type: 'silver', link: "<a href=\"http://cobot.me\">Cobot</a><span>: The one tool to run your coworking space</span>" }
-  { type: 'silver', link: "<a href=\"http://jumpstartlab.com\">JumpstartLab</a><span>: We build developers</span>" }
-  { type: 'silver', link: "<a href=\"http://evilmartians.com\">Evil Martians</a><span>: Agile Ruby on Rails development</span>" }
-  { type: 'silver', link: "<a href=\"http://zendesk.com\">Zendesk</a><span>: Love your helpdesk</span>" }
-  { type: 'silver', link: "<a href=\"http://stripe.com\">Stripe</a><span>: Payments for developers</span>" }
-  { type: 'silver', link: "<a href=\"http://basho.com\">Basho</a><span>: We make Riak!</span>" }
-  { type: 'silver', link: "<a href=\"http://thinkrelevance.com\">Relevance</a><span>: We deliver software solutions</span>" }
-  { type: 'silver', link: "<a href=\"http://mindmatters.de\">Mindmatters</a><span>: Software für Menschen</span>" }
-  { type: 'silver', link: "<a href=\"http://amenhq.com\">Amen</a><span>: The best and worst of everything</span>" }
-  { type: 'silver', link: "<a href=\"http://site5.com\">Site5</a><span>: Premium Web Hosting Solutions</span>" }
-  { type: 'silver', link: "<a href=\"http://www.crowdint.com\">Crowd Interactive</a><span>: Leading Rails consultancy in Mexico</span>" }
-  { type: 'silver', link: "<a href=\"http://www.atomicobject.com/detroit\">Atomic Object</a><span>: Work with really smart people</span>" }
-  { type: 'silver', link: "<a href=\"http://codeminer.com.br\">Codeminer</a><span>: smart services for your startup</span>" }
-  { type: 'silver', link: "<a href=\"http://cloudant.com\">Cloudant</a><span>: grow into your data layer, not out of it</span>" }
-  { type: 'silver', link: "<a href=\"http://gidsy.com\">Gidsy</a><span>: Explore, organize &amp; book unique things to do!</span>" }
-  { type: 'silver', link: "<a href=\"http://5apps.com\">5apps</a><span>: Package &amp; deploy HTML5 apps automatically</span>" }
-  { type: 'silver', link: "<a href=\"http://meltmedia.com\">Meltmedia</a><span>: We are Interactive Superheroes</span>" }
-  { type: 'silver', link: "<a href=\"http://www.fngtps.com\">Fingertips</a><span> offers design and development services</span>" }
-  { type: 'silver', link: "<a href=\"http://www.engineyard.com\">Engine Yard</a><span>: Build epic apps, let us handle the rest</span>" }
-  { type: 'silver', link: "<a href=\"http://malwarebytes.org\">Malwarebytes</a><span>: Defeat Malware once and for all.</span>" }
-  { type: 'silver', link: "<a href=\"http://readmill.com\">Readmill</a><span>: The best reading app on the iPad.</span>" }
-  { type: 'silver', link: "<a href=\"http://www.mdsol.com\">Medidata</a><span>: clinical tech improving quality of life</span>" }
-  { type: 'silver', link: "<a href=\"http://coderwall.com/teams/4f27194e973bf000040005f0\">ESM</a><span>: Japan's best agile Ruby/Rails consultancy</span>" }
-  { type: 'silver', link: "<a href=\"http://twitter.com\">Twitter</a><span>: instantly connects people everywhere</span>" }
-  { type: 'silver', link: "<a href=\"http://agileanimal.com\">AGiLE ANiMAL</a><span>: we <3 Travis CI.</span>" }
-  { type: 'silver', link: "<a href=\"http://tupalo.com\">Tupalo</a><span>: Discover, review &amp; share local businesses.</span>" }
-  { type: 'silver', link: "<a href=\"http://pivotallabs.com\">Pivotal Labs</a>"}
-  { type: 'silver', link: "<a href=\"http://fiksu.com\">Fiksu</a>"}
-  { type: 'silver', link: "<a href=\"http://saucelabs.com\">Sauce Labs</a>"}
-  { type: 'silver', link: "<a href=\"http://mogotest.com\">Mogotest</a><span>: Never be embarrassed by a visually broken site again.</span>"}
+  { id: '13', type: 'silver', link: "<a href=\"http://cobot.me\">Cobot</a><span>: The one tool to run your coworking space</span>" }
+  { id: '14', type: 'silver', link: "<a href=\"http://jumpstartlab.com\">JumpstartLab</a><span>: We build developers</span>" }
+  { id: '15', type: 'silver', link: "<a href=\"http://evilmartians.com\">Evil Martians</a><span>: Agile Ruby on Rails development</span>" }
+  { id: '16', type: 'silver', link: "<a href=\"http://zendesk.com\">Zendesk</a><span>: Love your helpdesk</span>" }
+  { id: '17', type: 'silver', link: "<a href=\"http://stripe.com\">Stripe</a><span>: Payments for developers</span>" }
+  { id: '18', type: 'silver', link: "<a href=\"http://basho.com\">Basho</a><span>: We make Riak!</span>" }
+  { id: '19', type: 'silver', link: "<a href=\"http://thinkrelevance.com\">Relevance</a><span>: We deliver software solutions</span>" }
+  { id: '20', type: 'silver', link: "<a href=\"http://mindmatters.de\">Mindmatters</a><span>: Software für Menschen</span>" }
+  { id: '21', type: 'silver', link: "<a href=\"http://amenhq.com\">Amen</a><span>: The best and worst of everything</span>" }
+  { id: '22', type: 'silver', link: "<a href=\"http://site5.com\">Site5</a><span>: Premium Web Hosting Solutions</span>" }
+  { id: '23', type: 'silver', link: "<a href=\"http://www.crowdint.com\">Crowd Interactive</a><span>: Leading Rails consultancy in Mexico</span>" }
+  { id: '24', type: 'silver', link: "<a href=\"http://www.atomicobject.com/detroit\">Atomic Object</a><span>: Work with really smart people</span>" }
+  { id: '25', type: 'silver', link: "<a href=\"http://codeminer.com.br\">Codeminer</a><span>: smart services for your startup</span>" }
+  { id: '26', type: 'silver', link: "<a href=\"http://cloudant.com\">Cloudant</a><span>: grow into your data layer, not out of it</span>" }
+  { id: '27', type: 'silver', link: "<a href=\"http://gidsy.com\">Gidsy</a><span>: Explore, organize &amp; book unique things to do!</span>" }
+  { id: '28', type: 'silver', link: "<a href=\"http://5apps.com\">5apps</a><span>: Package &amp; deploy HTML5 apps automatically</span>" }
+  { id: '29', type: 'silver', link: "<a href=\"http://meltmedia.com\">Meltmedia</a><span>: We are Interactive Superheroes</span>" }
+  { id: '30', type: 'silver', link: "<a href=\"http://www.fngtps.com\">Fingertips</a><span> offers design and development services</span>" }
+  { id: '31', type: 'silver', link: "<a href=\"http://www.engineyard.com\">Engine Yard</a><span>: Build epic apps, let us handle the rest</span>" }
+  { id: '32', type: 'silver', link: "<a href=\"http://malwarebytes.org\">Malwarebytes</a><span>: Defeat Malware once and for all.</span>" }
+  { id: '33', type: 'silver', link: "<a href=\"http://readmill.com\">Readmill</a><span>: The best reading app on the iPad.</span>" }
+  { id: '34', type: 'silver', link: "<a href=\"http://www.mdsol.com\">Medidata</a><span>: clinical tech improving quality of life</span>" }
+  { id: '35', type: 'silver', link: "<a href=\"http://coderwall.com/teams/4f27194e973bf000040005f0\">ESM</a><span>: Japan's best agile Ruby/Rails consultancy</span>" }
+  { id: '36', type: 'silver', link: "<a href=\"http://twitter.com\">Twitter</a><span>: instantly connects people everywhere</span>" }
+  { id: '37', type: 'silver', link: "<a href=\"http://agileanimal.com\">AGiLE ANiMAL</a><span>: we <3 Travis CI.</span>" }
+  { id: '38', type: 'silver', link: "<a href=\"http://tupalo.com\">Tupalo</a><span>: Discover, review &amp; share local businesses.</span>" }
+  { id: '39', type: 'silver', link: "<a href=\"http://pivotallabs.com\">Pivotal Labs</a>"}
+  { id: '40', type: 'silver', link: "<a href=\"http://fiksu.com\">Fiksu</a>"}
+  { id: '41', type: 'silver', link: "<a href=\"http://saucelabs.com\">Sauce Labs</a>"}
+  { id: '42', type: 'silver', link: "<a href=\"http://mogotest.com\">Mogotest</a><span>: Never be embarrassed by a visually broken site again.</span>"}
 ]
 
 @Travis.WORKERS = {
diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee
index 70c1ecb2..d3ceacf4 100644
--- a/assets/scripts/travis.coffee
+++ b/assets/scripts/travis.coffee
@@ -25,7 +25,7 @@ window.Travis = Em.Application.extend(Ember.Evented,
     @store = Travis.Store.create(
       adapter: Travis.RestAdapter.create(serializer: DS.RESTSerializer)
     )
-    #@store.loadMany(Travis.Sponsor, Travis.SPONSORS)
+    @store.loadMany(Travis.Sponsor, Travis.SPONSORS)
 
     @slider = new Travis.Slider()
     @pusher = new Travis.Pusher(Travis.config.pusher_key)