diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js
index 082253d47e..3fbe0b2c13 100644
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -19,5 +19,6 @@
 //= require ./enterprises/enterprises
 //= require ./payment_methods/payment_methods
 //= require ./products/products
+//= require ./shipping_methods/shipping_methods
 
 //= require_tree .
diff --git a/app/serializers/api/admin/enterprise_serializer.rb b/app/serializers/api/admin/enterprise_serializer.rb
index bc2292ff70..80acf6d7c4 100644
--- a/app/serializers/api/admin/enterprise_serializer.rb
+++ b/app/serializers/api/admin/enterprise_serializer.rb
@@ -1,3 +1,3 @@
 class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer
-  attributes :name, :id, :is_primary_producer, :is_distributor, :payment_method_ids
+  attributes :name, :id, :is_primary_producer, :is_distributor, :payment_method_ids, :shipping_method_ids
 end
\ No newline at end of file
diff --git a/app/views/admin/enterprises/_ng_form.html.haml b/app/views/admin/enterprises/_ng_form.html.haml
index 7d8a1ff24c..7a4ec13a1f 100644
--- a/app/views/admin/enterprises/_ng_form.html.haml
+++ b/app/views/admin/enterprises/_ng_form.html.haml
@@ -1,5 +1,6 @@
 = admin_inject_enterprise
 = admin_inject_payment_methods
+= admin_inject_shipping_methods
 .sixteen.columns.alpha{ ng: { app: 'admin.enterprises', controller: 'enterpriseCtrl' } }
   .eleven.columns.alpha
     = render partial: 'form', :locals => { f: f }
diff --git a/app/views/admin/enterprises/_sidebar.html.haml b/app/views/admin/enterprises/_sidebar.html.haml
index 74a8a0a8f4..dd77115452 100644
--- a/app/views/admin/enterprises/_sidebar.html.haml
+++ b/app/views/admin/enterprises/_sidebar.html.haml
@@ -19,24 +19,23 @@
     CREATE NEW
     %span.icon-arrow-right
 
-- shipping_methods_color = @shipping_methods.count > 0 ? (@enterprise.shipping_methods.count > 0 ? "blue" : "red") : "red"
 .sidebar_item.four.columns.alpha#shipping_methods{ ng: { show: 'Enterprise.is_distributor' } }
-  .four.columns.alpha.header{ class: "#{shipping_methods_color}" }
+  .four.columns.alpha.header{ ng: { class: "shippingMethodsColor()" } }
     %span.four.columns.alpha.centered Shipping Methods
-  .four.columns.alpha.list{ class: "#{shipping_methods_color}" }
+  .four.columns.alpha.list{ ng: { class: "shippingMethodsColor()" } }
     - if @shipping_methods.count > 0
       - @shipping_methods.each do |shipping_method|
-        %a.four.columns.alpha.list-item{ class: "#{cycle('odd','even')}", href: "#{edit_admin_shipping_method_path(shipping_method)}" }
+        %a.four.columns.alpha.list-item{ class: "#{cycle('odd','even')}", href: "#{edit_admin_shipping_method_path(shipping_method)}", ng: { controller: 'shippingMethodCtrl', init: "findShippingMethodByID(#{shipping_method.id})" } }
           %span.three.columns.alpha
             = shipping_method.name
           %span.one.column.omega
-            = f.check_box :shipping_method_ids, { :multiple => true }, shipping_method.id, nil
+            = f.check_box :shipping_method_ids, { :multiple => true, 'ng-model' => 'ShippingMethod.selected' }, shipping_method.id, nil
     - else
       .four.columns.alpha.list-item
         %span.three.columns.alpha None Available
         %span.one.column.omega
           %span.icon-remove-sign
-  %a.four.columns.alpha.button{ href: "#{new_admin_shipping_method_path}", class: "#{shipping_methods_color}" }
+  %a.four.columns.alpha.button{ href: "#{new_admin_shipping_method_path}", ng: { class: "shippingMethodsColor()" } }
     CREATE NEW
     %span.icon-arrow-right