diff --git a/web/app/assets/javascripts/feed.js b/web/app/assets/javascripts/feed.js
new file mode 100644
index 000000000..ccf56dd8d
--- /dev/null
+++ b/web/app/assets/javascripts/feed.js
@@ -0,0 +1,17 @@
+(function(context,$) {
+
+  "use strict";
+  context.JK = context.JK || {};
+  context.JK.FeedScreen = function(app) {
+
+    var logger = context.JK.logger;
+    var rest = context.JK.Rest();
+
+    function initialize() {
+
+    }
+
+    this.initialize = initialize;
+
+  }
+})(window,jQuery);
\ No newline at end of file
diff --git a/web/app/helpers/event_session_helper.rb b/web/app/helpers/event_session_helper.rb
index 3c46e7e38..2e9fb3f1d 100644
--- a/web/app/helpers/event_session_helper.rb
+++ b/web/app/helpers/event_session_helper.rb
@@ -44,7 +44,7 @@ module EventSessionHelper
     # if so, then we are playing.
     # if there has been none, we say it's still coming,
     # if there has been at least one, and it's over, we say session over
-    query = MusicSessionHistory.where(fan_access: true).where(created_at: event_session.starts_at..event_session.ends_at)
+    query = MusicSessionHistory.where(fan_access: true).where(created_at: (event_session.starts_at - 12.hours)..(event_session.ends_at + 12.hours))
     if event_session.user_id
       query = query.where(user_id: event_session.user_id)
     elsif event_session.band_id
diff --git a/web/app/views/clients/_feed.html.erb b/web/app/views/clients/_feed.html.erb
deleted file mode 100644
index 329be60dc..000000000
--- a/web/app/views/clients/_feed.html.erb
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- Feed Screen -->
-<%= content_tag(:div, :layout => 'screen', 'layout-id' => 'feed', :class => "screen secondary") do -%>
-    <%= content_tag(:div, :class => :content) do -%>
-        <%= content_tag(:div, :class => 'content-head') do -%>
-            <%= content_tag(:div, image_tag("content/icon_feed.png", {:height => 19, :width => 19}), :class => 'content-icon') %>
-            <%= content_tag(:h1, 'feed') %>
-            <%= render "screen_navigation" %>
-        <% end -%>
-        <%= content_tag(:div, :class => 'content-body') do -%>
-            <%= form_tag('', {:id => 'find-session-form', :class => 'inner-content'}) do -%>
-                <%= render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_FEED}) %>
-                <%= content_tag(:div, :class => 'filter-body') do %>
-                    <%= content_tag(:div, :class => 'content-body-scroller') do -%>
-                        <p>This feature not yet implemented</p>
-                        <%= content_tag(:div, content_tag(:div, '', :id => 'session-filter-results', :class => 'filter-results'), :class => 'content-wrapper') %>
-                    <% end -%>
-                <% end -%>
-            <% end -%>
-        <% end -%>
-    <% end -%>
-<% end -%>
-
-<!-- Session Row Template -->
-<script type="text/template" id="template-find-session-row">
-  <div class="profile-band-list-result band-list-result">
-    <div class="left">
-      <!-- avatar -->
-      <div class="avatar-small"><img src="{avatar_url}" /></div>
-      
-      <!-- name & location -->
-      <div style="width:220px;" class="result-name">{band_name}<br />
-    <span class="result-location">{band_location}</span>
-          <br /><br />
-          <div id="result_sessions" class="nowrap">{genres}</div>
-      <br /><br />
-      {follow_count} <img src="../assets/content/icon_followers.png" width="22" height="12" align="absmiddle" />&nbsp;&nbsp;&nbsp;{recording_count} <img src="../assets/content/icon_recordings.png" width="12" height="13" align="absmiddle" />&nbsp;&nbsp;&nbsp;{session_count} <img src="../assets/content/icon_session_tiny.png" width="12" height="12" align="absmiddle" /><br /><br />
-      </div>
-    </div>
-    <div class="left ml20 f11 whitespace w35"><br />
-      {biography}<br />
-      <br />
-      <div data-band-id={band_id}>{band_action_template}</div>
-    </div>
-    <div class="left ml10 w25 band-players">
-      <table class="musicians" cellpadding="0" cellspacing="5">{band_player_template}</table>
-    </div>
-    <br clear="all" />
-  </div>
-</script>
diff --git a/web/app/views/clients/_feed.html.haml b/web/app/views/clients/_feed.html.haml
new file mode 100644
index 000000000..002770ef3
--- /dev/null
+++ b/web/app/views/clients/_feed.html.haml
@@ -0,0 +1,13 @@
+%div{ layout: 'screen', :'layout-id' => 'feed', :class => 'screen secondary'}
+  .content
+    .content-head
+      .content-icon= image_tag("content/icon_feed.png", {:height => 19, :width => 19})
+      %h1 feed
+      = render "screen_navigation"
+    .content-body
+      = form_tag('', {:id => 'find-session-form', :class => 'inner-content'}) do
+        = render(:partial => "web_filter", :locals => {:search_type => Search::PARAM_FEED})
+        .filter-body
+          .content-body-scroller
+            %p This feature not yet implemented
+            .content-wrapper
diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb
index 7bdc683e5..21e359063 100644
--- a/web/app/views/clients/index.html.erb
+++ b/web/app/views/clients/index.html.erb
@@ -184,6 +184,9 @@
             var bandSetupPhotoScreen = new JK.BandSetupPhotoScreen(JK.app);
             bandSetupPhotoScreen.initialize();
 
+            var feedScreen = new JK.FeedScreen(JK.app);
+            feedScreen.initialize();
+
             var findSessionScreen = new JK.FindSessionScreen(JK.app);
             var sessionLatency = null;
             if ("jamClient" in window) {