diff --git a/app/controllers/repos.coffee b/app/controllers/repos.coffee
index 66562125..2dded81f 100644
--- a/app/controllers/repos.coffee
+++ b/app/controllers/repos.coffee
@@ -51,7 +51,6 @@ Controller = Ember.Controller.extend
       Visibility.every @config.intervals.updateTimes, @updateTimes.bind(this)
 
   runningJobs: (->
-    # TODO: this should also query for received jobs
     result = @store.filter('job', {}, (job) ->
       ['queued', 'started', 'received'].indexOf(job.get('state')) != -1
     )
diff --git a/app/controllers/top.coffee b/app/controllers/top.coffee
index ca72d1f7..9e0db063 100644
--- a/app/controllers/top.coffee
+++ b/app/controllers/top.coffee
@@ -6,6 +6,9 @@ Controller = Ember.Controller.extend
   needs: ['currentUser']
   userBinding: 'controllers.currentUser.model'
 
+  store: Ember.inject.service()
+  currentUserBinding: 'auth.currentUser'
+
   userName: (->
     @get('user.name') || @get('user.login')
   ).property('user.login', 'user.name')
@@ -14,6 +17,21 @@ Controller = Ember.Controller.extend
     "#{location.protocol}//www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=48&d=mm"
   ).property('user.gravatarId')
 
+  unseenBroadcasts: (->
+    @get('broadcasts').filter (broadcast) ->
+      !broadcast.get('isSeen')
+  ).property('broadcasts.[]', 'broadcasts.length')
+
+  v2broadcasts: (->
+    broadcasts = Ember.ArrayProxy.create(content: [])
+
+    if @get('currentUser.id')
+      @get('store').find('broadcast').then (result) ->
+        broadcasts.pushObjects(result.toArray())
+
+    broadcasts
+  ).property('currentUser.id')
+
   broadcasts: (->
 
     if @get('auth.signedIn')
diff --git a/app/services/flashes.coffee b/app/services/flashes.coffee
index db3ad895..19ae1de2 100644
--- a/app/services/flashes.coffee
+++ b/app/services/flashes.coffee
@@ -11,28 +11,28 @@ FlashesService = Ember.Service.extend
     @set('flashes', LimitedArray.create(limit: 1, content: []))
 
   messages: (->
-    broadcasts = @get('unseenBroadcasts')
+    #broadcasts = @get('unseenBroadcasts')
     flashes = @get('flashes')
     model = []
-    model.pushObjects(broadcasts) if broadcasts
+    # model.pushObjects(broadcasts) if broadcasts
     model.pushObjects(flashes.toArray().reverse())    if flashes
     model.uniq()
-  ).property('unseenBroadcasts.[]', 'flashes.[]', 'unseenBroadcasts.length', 'flashes.length')
+  ).property('flashes.[]', 'flashes.length')
 
-  unseenBroadcasts: (->
-    @get('broadcasts').filter (broadcast) ->
-      !broadcast.get('isSeen')
-  ).property('broadcasts.[]', 'broadcasts.length')
+  # unseenBroadcasts: (->
+  #   @get('broadcasts').filter (broadcast) ->
+  #     !broadcast.get('isSeen')
+  # ).property('broadcasts.[]', 'broadcasts.length')
 
-  broadcasts: (->
-    broadcasts = Ember.ArrayProxy.create(content: [])
+  # broadcasts: (->
+  #   broadcasts = Ember.ArrayProxy.create(content: [])
 
-    if @get('currentUser.id')
-      @get('store').find('broadcast').then (result) ->
-        broadcasts.pushObjects(result.toArray())
+  #   if @get('currentUser.id')
+  #     @get('store').find('broadcast').then (result) ->
+  #       broadcasts.pushObjects(result.toArray())
 
-    broadcasts
-  ).property('currentUser.id')
+  #   broadcasts
+  # ).property('currentUser.id')
 
   loadFlashes: (msgs) ->
     for msg in msgs
@@ -42,10 +42,10 @@ FlashesService = Ember.Service.extend
       Ember.run.later(this, (-> @get('flashes.content').removeObject(msg)), 15000)
 
   close: (msg) ->
-    if msg.constructor.modelName == "broadcast"
-      msg.setSeen()
-      @notifyPropertyChange('unseenBroadcasts')
-    else
-      @get('flashes').removeObject(msg)
+    # if msg.constructor.modelName == "broadcast"
+    #   msg.setSeen()
+    #   @notifyPropertyChange('unseenBroadcasts')
+    # else
+    @get('flashes').removeObject(msg)
 
 `export default FlashesService`