diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
index 938d21c..f46dc1e 100644
--- a/app/controllers/static_pages_controller.rb
+++ b/app/controllers/static_pages_controller.rb
@@ -40,10 +40,10 @@ class StaticPagesController < ApplicationController
 	    	@tournament = Tournament.find(@weight.tournament_id)
 	    	@matches = @tournament.upcomingMatches.select{|m| m.weight_id == @weight.id}
 	    	@wrestlers = Wrestler.where(weight_id: @weight.id)
-	    	@poolOneWrestlers = @wrestlers.select{|w| w.generatePoolNumber == 1}
-	    	@poolTwoWrestlers = @wrestlers.select{|w| w.generatePoolNumber == 2}
-	    	@poolThreeWrestlers = @wrestlers.select{|w| w.generatePoolNumber == 3}
-	    	@poolFourWrestlers = @wrestlers.select{|w| w.generatePoolNumber == 4}
+	    	#@poolOneWrestlers = @wrestlers.select{|w| w.generatePoolNumber == 1}
+	    	#@poolTwoWrestlers = @wrestlers.select{|w| w.generatePoolNumber == 2}
+	    	#@poolThreeWrestlers = @wrestlers.select{|w| w.generatePoolNumber == 3}
+	    	#@poolFourWrestlers = @wrestlers.select{|w| w.generatePoolNumber == 4}
 	    end
 
 
diff --git a/app/models/weight.rb b/app/models/weight.rb
index c8fbf90..7920927 100644
--- a/app/models/weight.rb
+++ b/app/models/weight.rb
@@ -2,7 +2,7 @@ class Weight < ActiveRecord::Base
 	belongs_to :tournament
 	has_many :wrestlers, dependent: :destroy
 
-	attr_accessor :pools, :bracket_size, :bracket_type
+	attr_accessor :pools, :bracket_size, :bracket_type, :poolRounds
 
 	def pools
 		@wrestlers = self.wrestlers
@@ -111,4 +111,10 @@ class Weight < ActiveRecord::Base
 		return @matches
 	end
 	
+	def poolRounds(matches)
+		@matchups = matches.select{|m| m.weight_id == self.id}
+		@poolMatches = @matchups.select{|m| m.bracket_position == nil}
+		return @poolMatches.sort_by{|m| m.round}.last.round
+	end
+	
 end
diff --git a/app/views/static_pages/_pool.html.erb b/app/views/static_pages/_pool.html.erb
new file mode 100644
index 0000000..7d39920
--- /dev/null
+++ b/app/views/static_pages/_pool.html.erb
@@ -0,0 +1,35 @@
+<% @round = 1 %>
+<% @pool = 1 %>
+<% until @wrestlers.select{|w| w.generatePoolNumber == @pool}.blank? %>
+    <h5>Pool <%= @pool %></h5>
+    <table class="table table-striped table-bordered">
+    	<thead>
+    		<tr>
+    			<th>Name</th>
+    			<% until @matches.select{|m| m.round == @round}.blank? %>
+    			 <% if @round <= @weight.poolRounds(@matches) %>
+    			    <th>R<%= @round %></th>
+    			 <% end %>
+    			 <% @round = @round + 1 %>
+    			<% end %>
+    		</tr>
+    	</thead>
+    	<tbody>
+    		<% @wrestlers.select{|w| w.generatePoolNumber == @pool}.each do |w| %>
+    		<tr>
+    			<td><%= w.original_seed %> <%= w.name %> <%= w.season_win %>-<%= w.season_loss %> <%= w.school.name %></td>
+    			<% @round = 1 %>
+    			<% until @matches.select{|m| m.round == @round}.blank? %>
+    			    <% if @round <= @weight.poolRounds(@matches) %>
+    			        <td><%= w.boutByRound(@round,@matches) %><br>Result</td>
+    			    <% end %>
+    			    <% @round = @round + 1 %>
+    			<% end %>
+
+    		</tr>
+    		<% end %>
+      	</tbody>
+    </table>
+<% @pool = @pool + 1 %>
+<% @round = 1 %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/static_pages/brackets.html.erb b/app/views/static_pages/brackets.html.erb
index 0099db3..2a25911 100644
--- a/app/views/static_pages/brackets.html.erb
+++ b/app/views/static_pages/brackets.html.erb
@@ -6,10 +6,18 @@
 <br>
 <br>
 <h1><%= @weight.max %> lbs Bracket</h1>
-<% if @weight.pools == 4 %>
-	<%= render 'fourPool' %>
-<% elsif @weight.pools == 2 %>
-	<%= render 'twoPool' %>
-<% elsif @weight.pools == 1 %>
-	<%= render 'onePool' %>
+
+<%= render 'pool' %>
+
+<% if @bracketType == "twoPoolsToFinal" %>
+	<%= render 'twoPoolFinalBracket' %>
+<% end %>
+<% if @bracketType == "twoPoolsToSemi" %>
+	<%= render 'twoPoolSemiBracket' %>
+<% end %>
+<% if @bracketType == "fourPoolsToQuarter" %>
+	<%= render 'fourPoolQuarterBracket' %>
+<% end %>
+<% if @bracketType == "fourPoolsToSemi" %>
+	<%= render 'fourPoolSemiBracket' %>
 <% end %>
\ No newline at end of file