diff --git a/ruby-sockets/marco-polo/client.rb b/ruby-sockets/marco-polo/client.rb
index b831a41..2254671 100644
--- a/ruby-sockets/marco-polo/client.rb
+++ b/ruby-sockets/marco-polo/client.rb
@@ -13,7 +13,7 @@ loop do
     end
     successes += 1
     backoff = 0.5
-    sleep 0.01
+    sleep 0.01 if ENV['SLEEP']
   rescue
     STDOUT.write('E')
     STDOUT.flush
diff --git a/ruby-sockets/marco-polo/em-server.rb b/ruby-sockets/marco-polo/em-server.rb
index e433a8f..cec05a6 100644
--- a/ruby-sockets/marco-polo/em-server.rb
+++ b/ruby-sockets/marco-polo/em-server.rb
@@ -1,21 +1,15 @@
+require 'logger'
+
 require 'eventmachine'
 require 'sequel'
 
-if ENV['MPDB']
-  DB = Sequel.connect(ENV['MPDB'])
-else
-  DB = Sequel.connect('sqlite://marco-polo.sqlite3')
-end
-
-begin
-  DB[:locations].empty?
-rescue Sequel::DatabaseError
-  DB.create_table(:locations) do
-    primary_key :id
-    String :client
-    Integer :x
-    Integer :y
-  end
+DB = Sequel.connect("postgres://#{ENV['USER']}@localhost/marco_polo",
+                    :max_connections => 10)
+DB.create_table! :locations do
+  primary_key :id
+  String :client
+  Integer :x
+  Integer :y
 end
 
 module MarcoPoloServer