diff --git a/Gemfile b/Gemfile
index 73a5473cf7..f300c4cc36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,7 @@ gem 'simple_form'
 
 gem 'unicorn'
 # gem 'spree_heroku'
+gem 'haml'
 
 
 # Gems used only for assets and not required
diff --git a/Gemfile.lock b/Gemfile.lock
index cee44a7318..3c239868a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,6 +89,7 @@ GEM
     ffi (1.0.11)
     gyoku (0.4.4)
       builder (>= 2.1.2)
+    haml (3.1.4)
     highline (1.6.8)
     hike (1.2.1)
     httpi (0.9.6)
@@ -273,6 +274,7 @@ PLATFORMS
 DEPENDENCIES
   capybara
   coffee-rails (~> 3.1.1)
+  haml
   jquery-rails
   machinist
   pg
diff --git a/app/models/spree/distributor.rb b/app/models/spree/distributor.rb
index d4532040fe..a9bfdfac9d 100644
--- a/app/models/spree/distributor.rb
+++ b/app/models/spree/distributor.rb
@@ -1,5 +1,7 @@
 module Spree
   class Distributor < ActiveRecord::Base
     set_table_name 'distributors'
+
+    validates :name, :pickup_address, :presence => true
   end
 end
diff --git a/app/overrides/replace_delivery_addres.rb b/app/overrides/replace_delivery_addres.rb
index 25b80c7116..4595efabad 100644
--- a/app/overrides/replace_delivery_addres.rb
+++ b/app/overrides/replace_delivery_addres.rb
@@ -1,4 +1,4 @@
-Deface::Override.new(:virtual_path  => "spree/checkout/_delivery",
-            :insert_before => "[data-hook='buttons']",
-            :text          => "<p>TODO: Select a drop off point.... </p>",
+Deface::Override.new(:virtual_path  => "spree/checkout/_address",
+            :replace       => "[data-hook='shipping_fieldset_wrapper']",
+            :partial       => "spree/checkout/distributor",
             :name          => "drop_off_point")
\ No newline at end of file
diff --git a/app/views/spree/checkout/_distributor.html.haml b/app/views/spree/checkout/_distributor.html.haml
new file mode 100644
index 0000000000..5800fcc430
--- /dev/null
+++ b/app/views/spree/checkout/_distributor.html.haml
@@ -0,0 +1,4 @@
+.columns.omega.six
+  %fieldset{:id => 'shipping'}
+    %legend Collection Point
+    =select("distributor", "distributor_id", Spree::Distributor.all.collect {|p| [ p.name , p.id] },)
\ No newline at end of file