diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..60d9708
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,9 @@
+provided you have a ruby installed, clone this and run
+
+```
+ruby swiss.rb
+```
+
+and enjoy
+
+pull requests welcome
diff --git a/swiss.rb b/swiss.rb
index 0d93aef..bc554ab 100644
--- a/swiss.rb
+++ b/swiss.rb
@@ -1,5 +1,7 @@
+DISPLAY_CHAR = '~'
 class Swiss
   attr_accessor :players
+  attr_accessor :used_pairs
   attr_accessor :current_pairs
   attr_accessor :current_round
   attr_accessor :number_of_rounds
@@ -11,9 +13,14 @@ def initialize(opts = {})
       puts "Name of player #{i + 1}?"
       name = gets.chomp
       name = nil if name.empty?
-      Player.new(:name => name)
+      Player.new(:name => name, :id => i)
     end
-    self.number_of_rounds = opts[:number_of_rounds] || calculate_rounds_required(players.size)
+    if self.players.count.odd? # add bye player
+      self.players << Player.new(:name => "Bye", :id => -1, :match_points => -1, :game_points => -1)
+    end
+    self.used_pairs = []
+    self.number_of_rounds = opts[:number_of_rounds] || Math::log(self.players.count, 2).ceil
+    puts_announcement("There will be #{self.number_of_rounds} rounds.")
   end
 
   def begin!
@@ -25,51 +32,47 @@ def begin!
     exit
   end
 
-  private
+  def next_round!
+    current_round == 1 ? initial_round : regular_round
+  end
 
-  def puts_announcement(text, options = {})
-    puts 80.times.map{ options[:character] || "#" }.to_a.join("") # magic number, terminal width
-    announcement_string = (39 - (text.length / 2)).times.map{ options[:character] || "#" }.to_a.join("")
+  def puts_announcement(text)
+    puts DISPLAY_CHAR * 80 # magic number, terminal width
+    announcement_string = DISPLAY_CHAR * (39 - (text.length / 2))
     announcement_string += " #{text} "
-    announcement_string = announcement_string.ljust(80, '#')
+    announcement_string = announcement_string.ljust(80, DISPLAY_CHAR)
     puts announcement_string
-    puts 80.times.map{ options[:character] || "#" }.to_a.join("")
+    puts DISPLAY_CHAR * 80
   end
 
   def announce_pairings
-    puts_announcement("Pairings:")
+    puts_announcement("Pairings for Round #{self.current_round}:")
     current_pairs.each do |pair|
-      if pair.length == 1
+      if pair[0].id == -1
+        puts "#{pair[1].name} gets a bye"
+      elsif pair[1].id == -1
         puts "#{pair[0].name} gets a bye"
       else
         puts "#{pair[0].name} VS #{pair[1].name}"
       end
+      used_pairs << [pair[0].id, pair[1].id]
       puts "----------------"
     end
   end
 
+  def pair_has_already_played?(pairing)
+    self.used_pairs.any?{ |used_pair| used_pair.sort == pairing.sort }
+  end
+
   def announce_scores
     puts_announcement "Scores after round #{current_round}:"
-    players.each { |p| puts "#{p.name} :: #{p.match_points}" }
+    players.each{ |p| puts "#{p.name} :: #{p.match_points}" if p.id != -1 }
   end
 
   def announce_winners
     puts_announcement "Final Scores:"
     players.sort_by{ |p| p.match_points }.reverse.each_with_index do |player, index|
-      puts "#{index + 1}. #{player.name} :: (#{player.match_points})"
-    end
-  end
-
-  def calculate_rounds_required(num_players)
-    case num_players
-    when 1..8
-      3
-    when 9..16
-      4
-    when 17..32
-      5
-    else
-      raise 'Too many players!'
+      puts "#{index + 1}. #{player.name} :: (#{player.match_points})" if player.id != -1
     end
   end
 
@@ -79,8 +82,28 @@ def initial_round
     retrieve_scores
   end
 
-  def next_round!
-    current_round == 1 ? initial_round : regular_round
+  def valid_pairings(user_ids)
+    user_ids.combination(2).to_a.reject do |pairing|
+      self.pair_has_already_played?(pairing)
+    end
+  end
+
+  def player_ids
+    self.players.map(&:id)
+  end
+
+  def sort_by_best_match(combos)
+    combos.sort do |c1, c2|
+      combo1_p1 = self.players.find{ |p| p.id == c1[0] }
+      combo1_p2 = self.players.find{ |p| p.id == c1[1] }
+      combo1_score = 1.0/((combo1_p1.match_points - combo1_p2.match_points) + 0.1* (combo1_p1.game_points - combo1_p2.game_points))
+
+      combo2_p1 = self.players.find{ |p| p.id == c2[0] }
+      combo2_p2 = self.players.find{ |p| p.id == c2[1] }
+      combo2_score = 1.0/((combo2_p1.match_points - combo2_p2.match_points) + 0.1* (combo2_p1.game_points - combo2_p2.game_points))
+
+      combo2_score <=> combo1_score
+    end
   end
 
   def regular_round
@@ -93,16 +116,55 @@ def regular_round
         rand(100) <=> rand(100)
       end
     end.reverse
-
     self.current_pairs = sorted_players.each_slice(2).to_a
+
+    if self.current_pairs.any?{ |pair| pair_has_already_played?(pair.map(&:id)) }
+      smart_pair()
+    end
+
     announce_pairings
     retrieve_scores
   end
 
+  def smart_pair
+    self.current_pairs = []
+    potential_pairings = valid_pairings(player_ids)
+    sorted_potential_pairs = sort_by_best_match(potential_pairings)
+    optimal_combinations = find_optimal_combos(sorted_potential_pairs)
+    while optimal_combinations == [] # not sure why/how this happens but it does :(
+      optimal_combinations = find_optimal_combos(sorted_potential_pairs.shuffle!)
+    end
+    optimal_combinations.each do |combo|
+      player1 = self.players.find{ |p| p.id == combo[0] }
+      player2 = self.players.find{ |p| p.id == combo[1] }
+      self.current_pairs << [player1, player2]
+    end
+  end
+
+  def find_optimal_combos(valid_combinations, prior_path = [])
+    path_length_needed = self.players.count / 2
+    valid_combinations.each do |combo|
+      prior_path << combo
+
+      return prior_path if prior_path.length == path_length_needed
+
+      remaining_ids = player_ids.reject{ |n| prior_path.flatten.include?(n) }
+      further_allowed_combos = sort_by_best_match(valid_pairings(remaining_ids))
+
+      if further_allowed_combos.length
+        return find_optimal_combos(further_allowed_combos, prior_path)
+      else
+        next
+      end
+    end
+  end
+
   def retrieve_scores
     puts_announcement("Scoring for Round #{current_round}:")
     current_pairs.each do |pair|
-      if pair.size == 1 #bye
+      if pair[0].id == -1
+        pair[1].award_bye_points
+      elsif pair[1].id == -1
         pair[0].award_bye_points
       else
         pair.each { |p| p.award_match_and_game_points }
@@ -112,7 +174,6 @@ def retrieve_scores
     self.current_pairs = []
     announce_scores
   end
-
 end
 
 class Player
@@ -120,11 +181,13 @@ class Player
   attr_accessor :match_points
   attr_accessor :game_points
   attr_accessor :matches
+  attr_accessor :id
 
   def initialize(opts = {})
     self.name = opts[:name] || "Player #{(0...4).map{(65+rand(26)).chr.upcase}.join}" # "Player XASB"
-    self.game_points = 0
-    self.match_points = 0
+    self.id = opts[:id]
+    self.game_points = opts[:game_points] || 0
+    self.match_points = opts[:match_points] || 0
   end
 
   def award_bye_points
@@ -134,6 +197,7 @@ def award_bye_points
 
   def award_match_and_game_points
     puts "Match score results for #{name} (3 for win, 1 for draw, 0 for loss):"
+
     self.match_points += gets.chomp.to_i
 
     puts "Game score results for #{name} (3 for EACH win, 1 for EACH draw, 0 for loss):"