diff --git a/app/controllers/match_proposals_controller.rb b/app/controllers/match_proposals_controller.rb
index 6079786..79e5773 100644
--- a/app/controllers/match_proposals_controller.rb
+++ b/app/controllers/match_proposals_controller.rb
@@ -1,6 +1,6 @@
 class MatchProposalsController < ApplicationController
   def index
-
+    @match = Match.find(params[:match_id])
   end
 
   def new
diff --git a/app/models/match.rb b/app/models/match.rb
index 4626848..82495a0 100755
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -42,6 +42,7 @@ class Match < ActiveRecord::Base
   has_many :users, through: :matchers
   has_many :predictions, dependent: :destroy
   has_many :comments, as: :commentable, order: "created_at", dependent: :destroy
+  has_many :match_proposals, inverse_of: :match, dependent: :destroy
   belongs_to :challenge
   belongs_to :contest
   belongs_to :contester1, class_name: "Contester", include: "team"
diff --git a/app/views/match_proposals/index.html.erb b/app/views/match_proposals/index.html.erb
index feb7985..726f1da 100644
--- a/app/views/match_proposals/index.html.erb
+++ b/app/views/match_proposals/index.html.erb
@@ -1,2 +1,24 @@
-<h1>MatchProposals#show</h1>
-<p>Find me in app/views/match_proposals/show.html.erb</p>
+<h1>Proposals</h1>
+<%= link_to 'Back', match_path(@match), class: 'button' %>
+<% if @match.match_proposals.empty? %>
+<h4>There are no proposals yet</h4>
+<% else %>
+
+<table id="proposals" class="striped">
+  <tr>
+    <th>Team</th>
+    <th>Time</th>
+    <th>Status</th>
+    <th>Actions</th>
+  </tr>
+  <% @match.match_proposals.each do |proposal| %>
+    <tr class="<%=cycle('even', 'odd') %>">
+      <td><%= proposal.team.name %></td>
+      <td><%= longtime proposal.proposed_time %> </td>
+      <td><%= proposal.status %></td>
+      <td>test</td>
+    </tr>
+  <% end %>
+</table>
+    <% end %>
+<%= link_to 'Back', match_path(@match), class: 'button' %><%= link_to 'Propose match time', new_match_proposal_path(@match), class: 'button' %>
\ No newline at end of file
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 0592286..550f8d8 100755
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -116,6 +116,11 @@
       <p><%= @match.report.html_safe %></p>
     </div>
   <% end %>
+  <% if cuser and (cuser.admin? or @match.of_user cuser) %>
+      <div class="referee">
+        <%= link_to 'Proposals', match_proposals_path(@match), class: 'button' %>
+      </div>
+  <% end %>
 
   <% if cuser and @match.can_update? cuser, [:report] %>
     <div class="referee">
@@ -130,6 +135,7 @@
       <% end %>
     </div>
   <% end %>
+
 </div>
 
 <%= add_comments @match %>