diff --git a/app/models/spree/gateway/stripe_connect.rb b/app/models/spree/gateway/stripe_connect.rb
new file mode 100644
index 0000000000..2e5104e346
--- /dev/null
+++ b/app/models/spree/gateway/stripe_connect.rb
@@ -0,0 +1,132 @@
+module Spree
+  class Gateway::StripeConnect < Gateway
+    preference :enterprise_id, :integer
+
+    attr_accessible :preferred_enterprise_id
+
+    CARD_TYPE_MAPPING = {
+      'American Express' => 'american_express',
+      'Diners Club' => 'diners_club',
+      'Visa' => 'visa'
+    }
+
+    def method_type
+      'stripe'
+    end
+
+    def provider_class
+      ActiveMerchant::Billing::StripeGateway
+    end
+
+    def payment_profiles_supported?
+      true
+    end
+
+    def stripe_account_id
+      StripeAccount.find_by_enterprise_id(preferred_enterprise_id).andand.stripe_user_id
+    end
+
+    def purchase(money, creditcard, gateway_options)
+      provider.purchase(*options_for_purchase_or_auth(money, creditcard, gateway_options))
+    end
+
+    def authorize(money, creditcard, gateway_options)
+      provider.authorize(*options_for_purchase_or_auth(money, creditcard, gateway_options))
+    end
+
+    def capture(money, response_code, gateway_options)
+      provider.capture(money, response_code, gateway_options)
+    end
+
+    def credit(money, creditcard, response_code, gateway_options)
+      provider.refund(money, response_code, {})
+    end
+
+    def void(response_code, creditcard, gateway_options)
+      provider.void(response_code, {})
+    end
+
+    def cancel(response_code)
+      provider.void(response_code, {})
+    end
+
+    def create_profile(payment)
+      return unless payment.source.gateway_customer_profile_id.nil?
+      options = {
+        email: payment.order.email,
+        login: Stripe.api_key,
+      }.merge! address_for(payment)
+
+      source = update_source!(payment.source)
+      if source.number.blank? && source.gateway_payment_profile_id.present?
+        creditcard = source.gateway_payment_profile_id
+      else
+        creditcard = source
+      end
+
+      response = provider.store(creditcard, options)
+      if response.success?
+        payment.source.update_attributes!({
+          cc_type: payment.source.cc_type, # side-effect of update_source!
+          gateway_customer_profile_id: response.params['id'],
+          gateway_payment_profile_id: response.params['default_source'] || response.params['default_card']
+        })
+
+      else
+        payment.send(:gateway_error, response.message)
+      end
+    end
+
+    private
+
+    # In this gateway, what we call 'secret_key' is the 'login'
+    def options
+      options = super
+      options.merge(:login => Stripe.api_key)
+    end
+
+    def options_for_purchase_or_auth(money, creditcard, gateway_options)
+      options = {}
+      options[:description] = "Spree Order ID: #{gateway_options[:order_id]}"
+      options[:currency] = gateway_options[:currency]
+      options[:stripe_account] = stripe_account_id
+
+      if customer = creditcard.gateway_customer_profile_id
+        options[:customer] = customer
+      end
+      if token_or_card_id = creditcard.gateway_payment_profile_id
+        # The Stripe ActiveMerchant gateway supports passing the token directly as the creditcard parameter
+        # The Stripe ActiveMerchant gateway supports passing the customer_id and credit_card id
+        # https://github.com/Shopify/active_merchant/issues/770
+        creditcard = token_or_card_id
+      end
+      return money, creditcard, options
+    end
+
+    def address_for(payment)
+      {}.tap do |options|
+        if address = payment.order.bill_address
+          options.merge!(address: {
+            address1: address.address1,
+            address2: address.address2,
+            city: address.city,
+            zip: address.zipcode
+          })
+
+          if country = address.country
+            options[:address].merge!(country: country.name)
+          end
+
+          if state = address.state
+            options[:address].merge!(state: state.name)
+          end
+        end
+      end
+    end
+
+    def update_source!(source)
+      source.cc_type = CARD_TYPE_MAPPING[source.cc_type] if CARD_TYPE_MAPPING.include?(source.cc_type)
+      source
+    end
+  end
+end
diff --git a/app/models/spree/payment_method_decorator.rb b/app/models/spree/payment_method_decorator.rb
index 3b9eff2cab..07395f22de 100644
--- a/app/models/spree/payment_method_decorator.rb
+++ b/app/models/spree/payment_method_decorator.rb
@@ -58,6 +58,8 @@ Spree::PaymentMethod.class_eval do
       "MasterCard Internet Gateway Service (MIGS)"
     when "Spree::Gateway::Pin"
       "Pin Payments"
+    when "Spree::Gateway::StripeConnect"
+      "Stripe"
     when "Spree::Gateway::PayPalExpress"
       "PayPal Express"
     else
diff --git a/config/application.rb b/config/application.rb
index 91472fdf3c..e58c7e8115 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -71,6 +71,7 @@ module Openfoodnetwork
     initializer "spree.gateway.payment_methods", :after => "spree.register.payment_methods" do |app|
       app.config.spree.payment_methods << Spree::Gateway::Migs
       app.config.spree.payment_methods << Spree::Gateway::Pin
+      app.config.spree.payment_methods << Spree::Gateway::StripeConnect
     end
 
     # Settings in config/environments/* take precedence over those specified here.
diff --git a/spec/models/spree/payment_method_spec.rb b/spec/models/spree/payment_method_spec.rb
index 70808c231e..28707876d3 100644
--- a/spec/models/spree/payment_method_spec.rb
+++ b/spec/models/spree/payment_method_spec.rb
@@ -21,6 +21,7 @@ module Spree
       Spree::Gateway::Migs.clean_name.should == "MasterCard Internet Gateway Service (MIGS)"
       Spree::Gateway::Pin.clean_name.should == "Pin Payments"
       Spree::Gateway::PayPalExpress.clean_name.should == "PayPal Express"
+      Spree::Gateway::StripeConnect.clean_name.should == "Stripe"
 
       # Testing else condition
       Spree::Gateway::BogusSimple.clean_name.should == "BogusSimple"