diff --git a/examples/demo/templates/satchless/checkout/delivery_details.html b/examples/demo/templates/satchless/checkout/delivery_details.html
index 983d7d1f..f75e6f9f 100644
--- a/examples/demo/templates/satchless/checkout/delivery_details.html
+++ b/examples/demo/templates/satchless/checkout/delivery_details.html
@@ -1,7 +1,6 @@
 {% extends 'satchless/checkout/base.html' %}
 {% load i18n %}
 {% load form_display %}
-{% load order_tags %}
 {% block title %}{{ block.super }} | {% trans "Delivery details" %}{% endblock %}
 
 {% block body-class %}{{ block.super }} delivery-details{% endblock %}
@@ -26,8 +25,8 @@
     <div class="container">
         <h1>{% trans "Delivery details" %}</h1>
         <form method="post" action="">{% csrf_token %}
-            {% for group, typ, form in delivery_group_forms %}
-            <h2>{% trans "Delivery method" %}: {{ typ|delivery_type }}</h2>
+            {% for group, delivery_type, form in delivery_group_forms %}
+            <h2>{% trans "Delivery method" %}: {{ delivery_type.name }}</h2>
             <h3>{% trans "Items deliverd using this method" %}:</h3>
             <ul>
             {% include 'satchless/checkout/snippets/delivery_group.html' %}
diff --git a/satchless/checkout/app.py b/satchless/checkout/app.py
index 6cf126f2..f4502373 100644
--- a/satchless/checkout/app.py
+++ b/satchless/checkout/app.py
@@ -1,4 +1,5 @@
 from django.conf.urls.defaults import patterns, url
+from django.conf import settings
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -21,6 +22,13 @@ class CheckoutApp(SatchlessApp):
     ]
 
     def __init__(self, *args, **kwargs):
+        delivery_providers = kwargs.pop('delivery_providers',
+                                        getattr(settings, 'SATCHLESS_DELIVERY_PROVIDERS', []))
+        self.delivery_queue = handler.DeliveryQueue(*delivery_providers)
+
+        payment_providers = kwargs.pop('payment_providers',
+                                        getattr(settings, 'SATCHLESS_PAYMENT_PROVIDERS', []))
+        self.payment_queue = handler.PaymentQueue(*payment_providers)
         super(CheckoutApp, self).__init__(*args, **kwargs)
         assert self.Order, ('You need to subclass CheckoutApp and provide Order')
         assert self.Cart, ('You need to subclass CheckoutApp and provide Cart')
@@ -96,7 +104,7 @@ def confirmation(self, request, order_token):
         order_pre_confirm.send(sender=self.Order, instance=order,
                                request=request)
         try:
-            handler.payment_queue.confirm(order=order)
+            self.payment_queue.confirm(order=order)
         except ConfirmationFormNeeded, e:
             return TemplateResponse(request, self.confirmation_templates, {
                 'formdata': e,
diff --git a/satchless/contrib/checkout/multistep/app.py b/satchless/contrib/checkout/multistep/app.py
index 7e7051c7..1ff8eb43 100644
--- a/satchless/contrib/checkout/multistep/app.py
+++ b/satchless/contrib/checkout/multistep/app.py
@@ -5,7 +5,6 @@
 
 from ....checkout import app
 from ....order import forms
-from ....order import handler
 
 class MultiStepCheckoutApp(app.CheckoutApp):
     checkout_templates = [
@@ -45,6 +44,7 @@ def __init__(self, *args, **kwargs):
         self.DeliveryMethodFormSet = (
             self.DeliveryMethodFormSet or
             modelformset_factory(self.DeliveryMethodForm._meta.model,
+                                 formset=forms.DeliveryMethodFormSet,
                                  form=self.DeliveryMethodForm,
                                  extra=0))
 
@@ -59,19 +59,18 @@ def checkout(self, request, order_token):
             return self.redirect_order(order)
         billing_form = self.BillingForm(data=request.POST or None,
                                         instance=order)
-        groups = order.groups.all()
+        delivery_groups = order.groups.all()
         shipping_formset = self.ShippingFormSet(data=request.POST or None,
-                                                queryset=groups)
+                                                queryset=delivery_groups)
         if all([billing_form.is_valid(),
                 shipping_formset.is_valid()]):
             order = billing_form.save()
             shipping_formset.save()
             return self.redirect('delivery-method', order_token=order.token)
-        return TemplateResponse(request, self.checkout_templates, {
-            'billing_form': billing_form,
-            'shipping_formset': shipping_formset,
-            'order': order,
-        })
+        context = self.get_context_data(request, billing_form=billing_form,
+                                        shipping_formset=shipping_formset,
+                                        order=order)
+        return TemplateResponse(request, self.checkout_templates, context)
 
     def delivery_method(self, request, order_token):
         """
@@ -83,14 +82,14 @@ def delivery_method(self, request, order_token):
             return self.redirect_order(order)
         delivery_groups = order.groups.all()
         delivery_method_formset = self.DeliveryMethodFormSet(data=request.POST or None,
-                                                             queryset=delivery_groups)
+                                                             queryset=delivery_groups,
+                                                             delivery_queue=self.delivery_queue)
         if delivery_method_formset.is_valid():
             delivery_method_formset.save()
             return self.redirect('payment-method', order_token=order.token)
-        return TemplateResponse(request, self.delivery_method_templates, {
-            'delivery_method_formset': delivery_method_formset,
-            'order': order,
-        })
+        context = self.get_context_data(request, order=order,
+                                        delivery_method_formset=delivery_method_formset)
+        return TemplateResponse(request, self.delivery_method_templates, context)
 
     def delivery_details(self, request, order_token):
         """
@@ -98,25 +97,20 @@ def delivery_details(self, request, order_token):
         User supplies further delivery details if needed.
         """
         order = self.get_order(request, order_token)
-        groups = order.groups.all()
-        if not all([group.delivery_type for group in groups]):
+        delivery_groups = order.groups.all()
+        if not all([group.delivery_type for group in delivery_groups]):
             return self.redirect('delivery-method', order_token=order.token)
-        delivery_group_forms = []
-        for group in groups:
-            delivery_type = group.delivery_type
-            form = handler.delivery_queue.get_configuration_form(group,
-                                                                 request.POST or None)
-            delivery_group_forms.append((group, delivery_type, form))
-        delivery_forms = [form for group, typ, form in delivery_group_forms]
+        delivery_group_forms = self.delivery_queue.get_configuration_forms_for_groups(
+            delivery_groups, request.POST or None)
+        delivery_forms = [form for group, delivery_type, form in delivery_group_forms]
         if all(form.is_valid() if form else True
                for form in delivery_forms):
-            for group, typ, form in delivery_group_forms:
-                handler.delivery_queue.save(group, form)
+            for group, delivery_type, form in delivery_group_forms:
+                self.delivery_queue.save(group, form)
             return self.redirect('payment-method', order_token=order.token)
-        return TemplateResponse(request, self.delivery_details_templates, {
-            'delivery_group_forms': delivery_group_forms,
-            'order': order,
-        })
+        context = self.get_context_data(request, order=order,
+                                        delivery_group_forms=delivery_group_forms)
+        return TemplateResponse(request, self.delivery_details_templates, context)
 
     def payment_method(self, request, order_token):
         """
@@ -127,15 +121,15 @@ def payment_method(self, request, order_token):
         if not order or order.status != 'checkout':
             return self.redirect_order(order)
         payment_form = forms.PaymentMethodForm(data=request.POST or None,
-                                               instance=order)
+                                               instance=order,
+                                               payment_queue=self.payment_queue)
         if request.method == 'POST':
             if payment_form.is_valid():
                 payment_form.save()
                 return self.redirect('payment-details', order_token=order.token)
-        return TemplateResponse(request, self.payment_method_templates, {
-            'order': order,
-            'payment_form': payment_form,
-        })
+        context = self.get_context_data(request, order=order,
+                                        payment_form=payment_form)
+        return TemplateResponse(request, self.payment_method_templates, context)
 
     def payment_details(self, request, order_token):
         """
@@ -148,19 +142,17 @@ def payment_details(self, request, order_token):
             return self.redirect_order(order)
         if not order.payment_type:
             return self.redirect('payment-method', order_token=order.token)
-        form = forms.get_payment_details_form(order, request.POST)
+        form = self.payment_queue.get_configuration_form(order, request.POST)
         def proceed(order, form):
-            handler.payment_queue.save(order, form=form)
+            self.payment_queue.save(order, form=form)
             order.set_status('payment-pending')
             return self.redirect('confirmation', order_token=order.token)
         if form:
             if request.method == 'POST':
                 if form.is_valid():
                     return proceed(order, form)
-            return TemplateResponse(request, self.payment_details_templates, {
-                'form': form,
-                'order': order,
-            })
+            context = self.get_context_data(request, form=form, order=order)
+            return TemplateResponse(request, self.payment_details_templates, context)
         return proceed(order, form)
 
     def get_urls(self):
diff --git a/satchless/contrib/checkout/multistep/templates/satchless/checkout/delivery_details.html b/satchless/contrib/checkout/multistep/templates/satchless/checkout/delivery_details.html
index 8531b87f..98e944ad 100644
--- a/satchless/contrib/checkout/multistep/templates/satchless/checkout/delivery_details.html
+++ b/satchless/contrib/checkout/multistep/templates/satchless/checkout/delivery_details.html
@@ -1,6 +1,5 @@
 {% extends 'satchless/order/base.html' %}
 {% load i18n %}
-{% load order_tags %}
 {% block title %}{{ block.super }} | {% trans "Delivery details" %}{% endblock %}
 {% block breadcrumbs %}
     {{ block.super }}
@@ -9,8 +8,8 @@
 {% block content %}
     <h1>{% trans "Delivery details" %}</h1>
     <form method="post" action="">{% csrf_token %}
-        {% for group, typ, form in delivery_group_forms %}
-        <h2>{% trans "Delivery method" %}: {{ typ|delivery_type }}</h2>
+        {% for group, delivery_type, form in delivery_group_forms %}
+        <h2>{% trans "Delivery method" %}: {{ delivery_type.name }}</h2>
         <h3>{% trans "Items deliverd using this method" %}:</h3>
         <ul>
         {% include 'satchless/checkout/snippets/delivery_group.html' %}
@@ -20,4 +19,4 @@ <h3>{% trans "Delivery details" %}:</h3>
         {% endfor %}
         <button type="submit">{% trans "Proceed" %}</button>
     </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/satchless/contrib/checkout/multistep/tests/__init__.py b/satchless/contrib/checkout/multistep/tests/__init__.py
index 10758dc9..475c7ffa 100644
--- a/satchless/contrib/checkout/multistep/tests/__init__.py
+++ b/satchless/contrib/checkout/multistep/tests/__init__.py
@@ -53,8 +53,10 @@ class TestCheckoutApp(app.MultiStepCheckoutApp):
                                            fields=order_forms.DeliveryMethodForm._meta.fields)
 
 
+
 class CheckoutTest(BaseCheckoutAppTests):
-    checkout_app = TestCheckoutApp()
+    checkout_app = TestCheckoutApp(delivery_providers=[TestDeliveryProvider],
+                                   payment_providers=[TestPaymentProviderWithConfirmation])
     urls = BaseCheckoutAppTests.MockUrls(checkout_app=checkout_app)
 
     def setUp(self):
@@ -91,20 +93,16 @@ def setUp(self):
                 'django.template.loaders.filesystem.Loader',
             )
         }
-        delivery_provider = TestDeliveryProvider()
         TestDeliveryType.objects.create(price=10, typ='pidgin', name='Pidgin')
         TestDeliveryType.objects.create(price=15, typ='courier', name='Courier',
                                         with_customer_notes=True)
 
         self.original_settings = self._setup_settings(self.custom_settings)
-        order_handler.delivery_queue = order_handler.DeliveryQueue(delivery_provider)
-        order_handler.payment_queue = order_handler.PaymentQueue(
-            TestPaymentProviderWithConfirmation)
+        self.anon_client = Client()
+
         order_handler.partitioner_queue = order_handler.PartitionerQueue(
             'satchless.contrib.order.partitioner.simple.SimplePhysicalPartitioner')
 
-        self.anon_client = Client()
-
         PostShippingType.objects.create(price=12, typ='polecony',
                                         name='list polecony')
         PostShippingType.objects.create(price=20, typ='list',
@@ -223,14 +221,14 @@ def test_delivery_method_view(self):
         order = self._create_order(self.anon_client)
         group = order.groups.get()
         self.assertTrue(group.require_shipping_address)
-        dtypes = list(order_handler.delivery_queue.enum_types(group))
+        dtypes = list(self.checkout_app.delivery_queue.enum_types(group))
         dtype = dtypes[0].typ
         response = self._test_status(
             self.checkout_app.reverse('delivery-method',
                                       kwargs={'order_token': order.token}),
             client_instance=self.anon_client, status_code=200)
         data = {}
-        df = response.context['delivery_formset']
+        df = response.context['delivery_method_formset']
         data[df.add_prefix('INITIAL_FORMS')] = len(df.forms)
         data[df.add_prefix('MAX_NUM_FORMS')] = ''
         data[df.add_prefix('TOTAL_FORMS')] = len(df.forms)
@@ -251,7 +249,7 @@ def test_delivery_method_view(self):
     def test_checkout_view(self):
         order = self._create_order(self.anon_client)
         group = order.groups.get()
-        dtypes = list(order_handler.delivery_queue.enum_types(group))
+        dtypes = list(self.checkout_app.delivery_queue.enum_types(group))
         group.delivery_type = dtypes[0].typ
         group.save()
         response = self._test_status(
@@ -298,11 +296,11 @@ def test_checkout_view(self):
     def test_payment_choice_view(self):
         order = self._create_order(self.anon_client)
         group = order.groups.get()
-        dtypes = list(order_handler.delivery_queue.enum_types(group))
+        dtypes = list(self.checkout_app.delivery_queue.enum_types(group))
         group.delivery_type = dtypes[0].typ
         group.save()
 
-        ptype = list(order_handler.payment_queue.enum_types(group))[0]
+        ptype = list(self.checkout_app.payment_queue.enum_types(group))[0]
         self._test_GET_status(self.checkout_app.reverse('payment-method',
                                                         kwargs={'order_token':
                                                                 order.token}),
@@ -325,15 +323,15 @@ def test_payment_choice_view(self):
     def test_payment_details_view(self):
         order = self._create_order(self.anon_client)
         group = order.groups.get()
-        dtypes = list(order_handler.delivery_queue.enum_types(group))
+        dtypes = list(self.checkout_app.delivery_queue.enum_types(group))
         group.delivery_type = dtypes[0].typ
         group.save()
 
-        ptype = list(order_handler.payment_queue.enum_types(group))[0]
+        ptype = list(self.checkout_app.payment_queue.enum_types(group))[0]
         order.payment_type = ptype.typ
         order.save()
 
-        order_handler.payment_queue = order_handler.PaymentQueue(
+        self.checkout_app.payment_queue = order_handler.PaymentQueue(
             TestPaymentProviderWithForm)
 
         self._test_status(self.checkout_app.reverse('payment-details',
diff --git a/satchless/contrib/checkout/singlestep/app.py b/satchless/contrib/checkout/singlestep/app.py
index ac9a1324..9efaf0f1 100644
--- a/satchless/contrib/checkout/singlestep/app.py
+++ b/satchless/contrib/checkout/singlestep/app.py
@@ -2,7 +2,6 @@
 from django.template.response import TemplateResponse
 
 from ....checkout import app
-from ....order import forms, handler
 
 class SingleStepCheckoutApp(app.CheckoutApp):
     BillingForm = None
@@ -26,21 +25,22 @@ def checkout(self, request, order_token):
             return self.redirect_order(order)
         delivery_groups = order.groups.all()
         for group in delivery_groups:
-            delivery_types = list(handler.delivery_queue.enum_types(group))
+            delivery_types = list(self.delivery_queue.enum_types(group))
             if len(delivery_types) != 1:
                 raise ImproperlyConfigured("The singlestep checkout requires "
                                            "exactly one delivery type per group.")
             group.delivery_type = delivery_types[0].typ
             group.save()
-        delivery_group_forms = forms.get_delivery_details_forms_for_groups(delivery_groups,
-                                                                           request.POST)
+
+        delivery_group_forms = self.delivery_queue.get_configuration_forms_for_groups(
+            delivery_groups, request.POST or None)
         delivery_valid = True
         if request.method == 'POST':
             delivery_valid = True
-            for group, typ, form in delivery_group_forms:
+            for group, delivery_type, form in delivery_group_forms:
                 if form:
                     delivery_valid = delivery_valid and form.is_valid()
-        payment_types = list(handler.payment_queue.enum_types(order))
+        payment_types = list(self.payment_queue.enum_types(order))
         if len(payment_types) != 1:
             raise ImproperlyConfigured("The singlestep checkout requires "
                                        "exactly one payment methods.")
@@ -48,22 +48,19 @@ def checkout(self, request, order_token):
         order.save()
         billing_form = self.BillingForm(request.POST or None,
                                         instance=order)
-        payment_form = forms.get_payment_details_form(order, request.POST)
+        payment_form = self.payment_queue.get_configuration_form(order, request.POST)
         if request.method == 'POST':
             billing_valid = billing_form.is_valid()
             payment_valid = payment_form.is_valid() if payment_form else True
             if billing_valid and delivery_valid and payment_valid:
                 order = billing_form.save()
                 for group, typ, form in delivery_group_forms:
-                    handler.delivery_queue.save(group, form)
-                handler.payment_queue.save(order, payment_form)
+                    self.delivery_queue.save(group, form)
+                self.payment_queue.save(order, payment_form)
                 order.set_status('payment-pending')
                 return self.redirect('confirmation',
                                      order_token=order.token)
-        return TemplateResponse(request, self.checkout_templates, {
-            'billing_form': billing_form,
-            'delivery_group_forms': delivery_group_forms,
-            'order': order,
-            'payment_form': payment_form,
-        })
-
+        context = self.get_context_data(request, billing_form=billing_form,
+                                        delivery_group_forms=delivery_group_forms,
+                                        order=order, payment_form=payment_form)
+        return TemplateResponse(request, self.checkout_templates, context)
diff --git a/satchless/contrib/checkout/singlestep/templates/satchless/checkout/checkout.html b/satchless/contrib/checkout/singlestep/templates/satchless/checkout/checkout.html
index 4c8a4ec0..34219b93 100644
--- a/satchless/contrib/checkout/singlestep/templates/satchless/checkout/checkout.html
+++ b/satchless/contrib/checkout/singlestep/templates/satchless/checkout/checkout.html
@@ -1,6 +1,5 @@
 {% extends 'satchless/order/base.html' %}
 {% load i18n %}
-{% load order_tags %}
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="">{% trans "Order (business)" %}</a></li>
@@ -11,8 +10,8 @@ <h1>{% trans "Order (business)" %}</h1>
     <form method="post" action="">{% csrf_token %}
         <h2>{% trans "Billing details" %}</h2>
         {{ billing_form.as_p }}
-        {% for group, typ, form in delivery_group_forms %}
-        <h2>{% trans "Delivery method" %}: {{ typ|delivery_type }}</h2>
+        {% for group, delivery_type, form in delivery_group_forms %}
+        <h2>{% trans "Delivery method" %}: {{ delivery_type.name }}</h2>
         <h3>{% trans "Items delivered using this method" %}:</h3>
         <ul>
         {% include 'satchless/checkout/snippets/delivery_group.html' %}
diff --git a/satchless/contrib/checkout/singlestep/tests/__init__.py b/satchless/contrib/checkout/singlestep/tests/__init__.py
index 15278404..4bb55c3e 100644
--- a/satchless/contrib/checkout/singlestep/tests/__init__.py
+++ b/satchless/contrib/checkout/singlestep/tests/__init__.py
@@ -31,7 +31,8 @@ class TestSingleStepCheckoutApp(SingleStepCheckoutApp):
     BillingForm = modelform_factory(order_app.Order,
                                     BillingForm)
 
-checkout_app = TestSingleStepCheckoutApp()
+checkout_app = TestSingleStepCheckoutApp(delivery_providers=[TestDeliveryProvider],
+                                         payment_providers=[TestPaymentProviderWithConfirmation])
 
 
 class App(BaseCheckoutAppTests):
@@ -64,8 +65,6 @@ def setUp(self):
 
         TestDeliveryType.objects.create(price=10, typ='courier', name='Courier',
                                         with_customer_notes=True)
-        order_handler.delivery_queue = order_handler.DeliveryQueue(TestDeliveryProvider)
-        order_handler.payment_queue = order_handler.PaymentQueue(TestPaymentProviderWithConfirmation)
         self.anon_client = Client()
         self.original_pricing_handlers = settings.SATCHLESS_PRICING_HANDLERS
         pricing_handler.pricing_queue = pricing_handler.PricingQueue(FiveZlotyPriceHandler)
diff --git a/satchless/contrib/payment/django_payments_provider/models.py b/satchless/contrib/payment/django_payments_provider/models.py
index 22eb26b8..ca1426e8 100644
--- a/satchless/contrib/payment/django_payments_provider/models.py
+++ b/satchless/contrib/payment/django_payments_provider/models.py
@@ -2,6 +2,7 @@
 from payments.models import Payment
 
 class DjangoPaymentsPayment(models.Model):
+
     payment = models.OneToOneField(Payment,
                                    related_name='satchless_payment_variant')
 
diff --git a/satchless/contrib/pricing/cache/__init__.py b/satchless/contrib/pricing/cache/__init__.py
index 9280887b..345a14fe 100644
--- a/satchless/contrib/pricing/cache/__init__.py
+++ b/satchless/contrib/pricing/cache/__init__.py
@@ -13,7 +13,9 @@ def get_cache_key(self, currency=None, product=None, variant=None, **kwargs):
         return ret
 
     def _get_key(self, **kwargs):
-        return urllib.urlencode(self.get_cache_key(**kwargs), True)
+        key = self.get_cache_key(**kwargs)
+        value = sorted(key.items())
+        return urllib.urlencode(value, doseq=True)
 
     def get_variant_price(self, variant, currency, price, quantity=1, **context):
         # Visit cache for a matching entry first
diff --git a/satchless/order/forms.py b/satchless/order/forms.py
index 263b185e..46e4b7a2 100644
--- a/satchless/order/forms.py
+++ b/satchless/order/forms.py
@@ -1,62 +1,47 @@
 from django import forms
+from django.forms.models import BaseModelFormSet
 from django.utils.translation import ugettext_lazy as _
 
-from . import handler
 
 class DeliveryMethodForm(forms.ModelForm):
+
     delivery_type = forms.ChoiceField(label=_('Delivery method'), choices=[])
 
     class Meta:
         fields = ('delivery_type',)
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, delivery_queue, *args, **kwargs):
         super(DeliveryMethodForm, self).__init__(*args, **kwargs)
-        types = handler.delivery_queue.as_choices(delivery_group=self.instance)
+        types = delivery_queue.as_choices(delivery_group=self.instance)
         self.fields['delivery_type'].choices = types
 
 
-def get_delivery_details_forms_for_groups(groups, data):
-    '''
-    For each delivery group creates a (group, typ, delivery details form) tuple.
-    If there is no form, the third element is None.
-    '''
-    groups_and_forms = []
-    for group in groups:
-        delivery_type = group.delivery_type
-        form = handler.delivery_queue.get_configuration_form(group, data)
-        groups_and_forms.append((group, delivery_type, form))
-    return groups_and_forms
+class DeliveryMethodFormSet(BaseModelFormSet):
+
+    def __init__(self, delivery_queue, *args, **kwargs):
+        self.delivery_queue = delivery_queue
+        super(DeliveryMethodFormSet, self).__init__(*args, **kwargs)
+
+    def _construct_form(self, *args, **kwargs):
+        kwargs['delivery_queue'] = self.delivery_queue
+        return super(DeliveryMethodFormSet, self)._construct_form(*args, **kwargs)
 
 
 class PaymentMethodForm(forms.ModelForm):
-    payment_type = forms.ChoiceField(choices=())
+
+    payment_type = forms.ChoiceField(choices=[])
 
     class Meta:
         fields = ('payment_type',)
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, payment_queue, *args, **kwargs):
         super(PaymentMethodForm, self).__init__(*args, **kwargs)
-        types = get_payment_choices(self.instance)
+        types = payment_queue.as_choices(order=self.instance)
         self.fields['payment_type'].choices = types
 
 
-def get_payment_choices(order):
-    return list(handler.payment_queue.as_choices(order=order))
-
-def get_payment_type_display(order, value):
-    '''
-    Note:
-    Probably returns a django.utils.functional.__proxy__ object (lazy translation)
-    If you're not using it in a template (eg saving to db) then wrap the
-    returned value in unicode() to evaluate it.
-    '''
-    return next((x[1] for x in get_payment_choices(order) if x[0] == value), None)
-
-def get_payment_details_form(order, data):
-    return handler.payment_queue.get_configuration_form(order, data)
-
-
 class ShippingForm(forms.ModelForm):
+
     class Meta:
         fields = ['shipping_first_name', 'shipping_last_name',
                   'shipping_company_name', 'shipping_street_address_1',
@@ -66,6 +51,7 @@ class Meta:
 
 
 class BillingForm(forms.ModelForm):
+
     class Meta:
         fields = ['billing_first_name', 'billing_last_name',
                   'billing_company_name', 'billing_street_address_1',
diff --git a/satchless/order/handler.py b/satchless/order/handler.py
index f98df6aa..3622839a 100644
--- a/satchless/order/handler.py
+++ b/satchless/order/handler.py
@@ -66,10 +66,6 @@ def confirm(self, order, typ=None):
         return provider.confirm(order=order, typ=typ)
 
 
-payment_providers = getattr(settings, 'SATCHLESS_PAYMENT_PROVIDERS', [])
-payment_queue = PaymentQueue(*payment_providers)
-
-
 ### DELIVERY PROVIDERS
 class DeliveryQueue(DeliveryProvider, QueueHandler):
     element_class = DeliveryProvider
@@ -98,11 +94,15 @@ def get_configuration_form(self, delivery_group, data, typ=None):
         return provider.get_configuration_form(delivery_group=delivery_group,
                                                data=data, typ=typ)
 
+    def get_configuration_forms_for_groups(self, delivery_groups, data):
+        delivery_group_forms = []
+        delivery_types = dict((dt.typ, dt) for dt in self.enum_types())
+        for group in delivery_groups:
+            form = self.get_configuration_form(group, data)
+            delivery_group_forms.append((group, delivery_types[group.delivery_type], form))
+        return delivery_group_forms
+
     def save(self, delivery_group, form, typ=None):
         typ = typ or delivery_group.delivery_type
         provider = self._get_provider(delivery_group, typ)
         return provider.save(delivery_group=delivery_group, form=form, typ=typ)
-
-
-delivery_providers = getattr(settings, 'SATCHLESS_DELIVERY_PROVIDERS', [])
-delivery_queue = DeliveryQueue(*delivery_providers)
\ No newline at end of file
diff --git a/satchless/order/models.py b/satchless/order/models.py
index df673907..582c8ad8 100644
--- a/satchless/order/models.py
+++ b/satchless/order/models.py
@@ -42,7 +42,7 @@ def get_from_cart(self, cart, instance=None):
 
 class Order(models.Model):
     """
-    add this to your concrete model:
+    Add this to your concrete model:
     cart = models.ForeignKey(Cart, related_name='orders')
     """
     STATUS_CHOICES = (
diff --git a/satchless/order/templatetags/__init__.py b/satchless/order/templatetags/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/satchless/order/templatetags/order_tags.py b/satchless/order/templatetags/order_tags.py
deleted file mode 100644
index 5b58dbcd..00000000
--- a/satchless/order/templatetags/order_tags.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from django.template import Library
-from satchless.order import handler
-
-register = Library()
-
-@register.filter
-def delivery_type(typ):
-    for delivery_type in handler.delivery_queue.enum_types():
-        if delivery_type.typ == typ:
-            return delivery_type.name
\ No newline at end of file